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>

42 files changed, 531 insertions, 542 deletions

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;