18 files changed, 265 insertions, 615 deletions
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 1b63cc437d5d..a00c849bfee6 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -45,7 +45,7 @@ public:
     using SbxValue::GetObject;
     SbxVariable* GetObject();
     /// @throws css::uno::RuntimeException
-    void SetUnoObject( const css::uno::Any& aObj )throw ( css::uno::RuntimeException, std::exception ) ;
+    void SetUnoObject( const css::uno::Any& aObj ) ;
 };
 
 class FormObjEventListenerImpl;
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 21ffb5b90a2f..56cf96adebb6 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -135,16 +135,12 @@ public:
 
 
     // XEventListener
-    virtual void SAL_CALL disposing( const lang::EventObject& Source )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& Source ) override;
 
     // XContainerListener
-    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event )
-        throw(uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event )
-        throw(uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) override;
+    virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) override;
 };
 
 
@@ -216,7 +212,6 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr,
 
 
 void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& Source )
-    throw( uno::RuntimeException, std::exception )
 {
     (void)Source;
 }
@@ -225,7 +220,6 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& S
 
 
 void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::ContainerEvent& Event )
-    throw( uno::RuntimeException, std::exception )
 {
     bool bLibContainer = maLibName.isEmpty();
     OUString aName;
@@ -272,7 +266,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con
 
 
 void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::ContainerEvent& Event )
-    throw( uno::RuntimeException, std::exception )
 {
     OUString aName;
     Event.Accessor >>= aName;
@@ -298,7 +291,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con
 
 
 void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::ContainerEvent& Event )
-    throw( uno::RuntimeException, std::exception )
 {
     OUString aName;
     Event.Accessor >>= aName;
@@ -1629,11 +1621,11 @@ public:
         : maName( aName ), maLanguage( aLanguage), maSource( aSource ) {}
 
     // Methods XStarBasicModuleInfo
-    virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getName() override
         { return maName; }
-    virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLanguage() override
         { return maLanguage; }
-    virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getSource() override
         { return maSource; }
 };
 
@@ -1648,9 +1640,9 @@ public:
         : maName( aName ), mData( Data ) {}
 
     // Methods XStarBasicDialogInfo
-    virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getName() override
         { return maName; }
-    virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Sequence< sal_Int8 > SAL_CALL getData() override
         { return mData; }
 };
 
@@ -1683,17 +1675,17 @@ public:
     {}
 
     // Methods XStarBasicLibraryInfo
-    virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getName() override
         { return maName; }
-    virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() override
         { return mxModuleContainer; }
-    virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) override
+    virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() override
         { return mxDialogContainer; }
-    virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getPassword() override
         { return maPassword; }
-    virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getExternalSourceURL() override
         { return maExternaleSourceURL; }
-    virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getLinkTargetURL() override
         { return maLinkTargetURL; }
 };
 
@@ -1707,49 +1699,36 @@ public:
         :mpLib( pLib ) {}
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::NoSuchElementException,
-              lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::ElementExistException,
-              lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
 // Methods XElementAccess
 uno::Type ModuleContainer_Impl::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicModuleInfo>::get();
     return aModuleType;
 }
 
 sal_Bool ModuleContainer_Impl::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     return mpLib && !mpLib->GetModules().empty();
 }
 
 // Methods XNameAccess
 uno::Any ModuleContainer_Impl::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr;
     if( !pMod )
@@ -1761,7 +1740,6 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > ModuleContainer_Impl::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_uInt16 nMods = mpLib ? mpLib->GetModules().size() : 0;
     uno::Sequence< OUString > aRetSeq( nMods );
@@ -1774,7 +1752,6 @@ uno::Sequence< OUString > ModuleContainer_Impl::getElementNames()
 }
 
 sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr;
     bool bRet = (pMod != nullptr);
@@ -1784,7 +1761,6 @@ sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByName( aName );
     insertByName( aName, aElement );
@@ -1793,7 +1769,6 @@ void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any&
 
 // Methods XNameContainer
 void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicModuleInfo>::get();
     const uno::Type& aAnyType = aElement.getValueType();
@@ -1807,7 +1782,6 @@ void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any&
 }
 
 void ModuleContainer_Impl::removeByName( const OUString& Name )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SbModule* pMod = mpLib ? mpLib->FindModule( Name ) : nullptr;
     if( !pMod )
@@ -1853,40 +1827,30 @@ public:
         :mpLib( pLib ) {}
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
 // Methods XElementAccess
 uno::Type DialogContainer_Impl::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicDialogInfo>::get();
     return aModuleType;
 }
 
 sal_Bool DialogContainer_Impl::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     bool bRet = false;
 
@@ -1906,7 +1870,6 @@ sal_Bool DialogContainer_Impl::hasElements()
 
 // Methods XNameAccess
 uno::Any DialogContainer_Impl::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxClassType::DontCare );
     SbxObject* pObj = dynamic_cast<SbxObject*>(pVar);
@@ -1924,7 +1887,6 @@ uno::Any DialogContainer_Impl::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > DialogContainer_Impl::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int16 nCount = mpLib->GetObjects()->Count();
     uno::Sequence< OUString > aRetSeq( nCount );
@@ -1946,7 +1908,6 @@ uno::Sequence< OUString > DialogContainer_Impl::getElementNames()
 }
 
 sal_Bool DialogContainer_Impl::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     bool bRet = false;
     SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxClassType::DontCare );
@@ -1961,7 +1922,6 @@ sal_Bool DialogContainer_Impl::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByName( aName );
     insertByName( aName, aElement );
@@ -1970,7 +1930,6 @@ void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any&
 
 // Methods XNameContainer
 void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     (void)aName;
     uno::Type aModuleType = cppu::UnoType<script::XStarBasicDialogInfo>::get();
@@ -1986,7 +1945,6 @@ void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any&
 }
 
 void DialogContainer_Impl::removeByName( const OUString& Name )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     (void)Name;
     SbxVariable* pVar = mpLib->GetObjects()->Find( Name, SbxClassType::DontCare );
@@ -2008,41 +1966,31 @@ public:
         :mpMgr( pMgr ) {}
 
     // Methods XElementAccess
-    virtual uno::Type SAL_CALL getElementType()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement )
-        throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 };
 
 
 // Methods XElementAccess
 uno::Type LibraryContainer_Impl::getElementType()
-    throw(uno::RuntimeException, std::exception)
 {
     uno::Type aType = cppu::UnoType<script::XStarBasicLibraryInfo>::get();
     return aType;
 }
 
 sal_Bool LibraryContainer_Impl::hasElements()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_Int32 nLibs = mpMgr->GetLibCount();
     bool bRet = (nLibs > 0);
@@ -2051,7 +1999,6 @@ sal_Bool LibraryContainer_Impl::hasElements()
 
 // Methods XNameAccess
 uno::Any LibraryContainer_Impl::getByName( const OUString& aName )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     uno::Any aRetAny;
     if( !mpMgr->HasLib( aName ) )
@@ -2094,7 +2041,6 @@ uno::Any LibraryContainer_Impl::getByName( const OUString& aName )
 }
 
 uno::Sequence< OUString > LibraryContainer_Impl::getElementNames()
-    throw(uno::RuntimeException, std::exception)
 {
     sal_uInt16 nLibs = mpMgr->GetLibCount();
     uno::Sequence< OUString > aRetSeq( nLibs );
@@ -2107,7 +2053,6 @@ uno::Sequence< OUString > LibraryContainer_Impl::getElementNames()
 }
 
 sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName )
-    throw(uno::RuntimeException, std::exception)
 {
     bool bRet = mpMgr->HasLib( aName );
     return bRet;
@@ -2115,7 +2060,6 @@ sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     removeByName( aName );
     insertByName( aName, aElement );
@@ -2123,7 +2067,6 @@ void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any
 
 // Methods XNameContainer
 void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement )
-    throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     (void)aName;
     (void)aElement;
@@ -2131,7 +2074,6 @@ void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any&
 }
 
 void LibraryContainer_Impl::removeByName( const OUString& Name )
-    throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
 {
     StarBASIC* pLib = mpMgr->GetLib( Name );
     if( !pLib )
@@ -2157,21 +2099,16 @@ public:
 
 public:
     // Methods
-    virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer()
-        throw(uno::RuntimeException, std::exception) override;
+    virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() override;
     virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password,
-        const OUString& ExternalSourceURL, const OUString& LinkTargetURL )
-            throw(container::ElementExistException, uno::RuntimeException, std::exception) override;
+        const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) override;
     virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName,
-        const OUString& Language, const OUString& Source )
-            throw(container::NoSuchElementException, uno::RuntimeException, std::exception) override;
+        const OUString& Language, const OUString& Source ) override;
     virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName,
-        const uno::Sequence< sal_Int8 >& Data )
-            throw(container::NoSuchElementException, uno::RuntimeException, std::exception) override;
+        const uno::Sequence< sal_Int8 >& Data ) override;
 };
 
 uno::Reference< container::XNameContainer > SAL_CALL StarBasicAccess_Impl::getLibraryContainer()
-    throw(uno::RuntimeException, std::exception)
 {
     if( !mxLibContainer.is() )
         mxLibContainer = new LibraryContainer_Impl( mpMgr );
@@ -2185,7 +2122,6 @@ void SAL_CALL StarBasicAccess_Impl::createLibrary
     const OUString& ExternalSourceURL,
     const OUString& LinkTargetURL
 )
-    throw(container::ElementExistException, uno::RuntimeException, std::exception)
 {
     (void)ExternalSourceURL;
     StarBASIC* pLib = mpMgr->CreateLib( LibName, Password, LinkTargetURL );
@@ -2199,7 +2135,6 @@ void SAL_CALL StarBasicAccess_Impl::addModule
     const OUString& Language,
     const OUString& Source
 )
-    throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     (void)Language;
     StarBASIC* pLib = mpMgr->GetLib( LibraryName );
@@ -2216,7 +2151,6 @@ void SAL_CALL StarBasicAccess_Impl::addDialog
     const OUString& DialogName,
     const uno::Sequence< sal_Int8 >& Data
 )
-    throw(container::NoSuchElementException, uno::RuntimeException, std::exception)
 {
     (void)LibraryName;
     (void)DialogName;
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 1401dcd45242..7f90e16ce6b6 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -40,27 +40,27 @@ public:
     ErrObject();
 
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) override;
-    virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int32 SAL_CALL getNumber() override;
+    virtual void SAL_CALL setNumber( ::sal_Int32 _number ) override;
+    virtual ::sal_Int32 SAL_CALL getHelpContext() override;
+    virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) override;
+    virtual OUString SAL_CALL getHelpFile() override;
+    virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) override;
+    virtual OUString SAL_CALL getDescription() override;
+    virtual void SAL_CALL setDescription( const OUString& _description ) override;
+    virtual OUString SAL_CALL getSource() override;
+    virtual void SAL_CALL setSource( const OUString& _source ) override;
 
     // Methods
-    virtual void SAL_CALL Clear(  ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL Clear(  ) override;
+    virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) override;
     // XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) override;
 
     // Helper method
     /// @throws css::uno::RuntimeException
     void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description,
-        const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException);
+        const uno::Any& HelpFile, const uno::Any& HelpContext );
 };
 
 ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
@@ -68,13 +68,13 @@ ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
 }
 
 sal_Int32 SAL_CALL
-ErrObject::getNumber() throw (uno::RuntimeException, std::exception)
+ErrObject::getNumber()
 {
     return m_nNumber;
 }
 
 void SAL_CALL
-ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception)
+ErrObject::setNumber( ::sal_Int32 _number )
 {
     GetSbData()->pInst->setErrorVB( _number, OUString() );
     OUString _description = GetSbData()->pInst->GetErrorMsg();
@@ -82,55 +82,55 @@ ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::e
 }
 
 ::sal_Int32 SAL_CALL
-ErrObject::getHelpContext() throw (uno::RuntimeException, std::exception)
+ErrObject::getHelpContext()
 {
     return m_nHelpContext;
 }
 void SAL_CALL
-ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception)
+ErrObject::setHelpContext( ::sal_Int32 _helpcontext )
 {
     m_nHelpContext = _helpcontext;
 }
 
 OUString SAL_CALL
-ErrObject::getHelpFile() throw (uno::RuntimeException, std::exception)
+ErrObject::getHelpFile()
 {
     return m_sHelpFile;
 }
 
 void SAL_CALL
-ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception)
+ErrObject::setHelpFile( const OUString& _helpfile )
 {
     m_sHelpFile = _helpfile;
 }
 
 OUString SAL_CALL
-ErrObject::getDescription() throw (uno::RuntimeException, std::exception)
+ErrObject::getDescription()
 {
     return m_sDescription;
 }
 
 void SAL_CALL
-ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception)
+ErrObject::setDescription( const OUString& _description )
 {
     m_sDescription = _description;
 }
 
 OUString SAL_CALL
-ErrObject::getSource() throw (uno::RuntimeException, std::exception)
+ErrObject::getSource()
 {
     return m_sSource;
 }
 
 void SAL_CALL
-ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception)
+ErrObject::setSource( const OUString& _source )
 {
     m_sSource = _source;
 }
 
 // Methods
 void SAL_CALL
-ErrObject::Clear(  ) throw (uno::RuntimeException, std::exception)
+ErrObject::Clear(  )
 {
     m_sHelpFile.clear();
     m_sSource = m_sHelpFile;
@@ -140,7 +140,7 @@ ErrObject::Clear(  ) throw (uno::RuntimeException, std::exception)
 }
 
 void SAL_CALL
-ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception)
+ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext )
 {
     setData( Number, Source, Description, HelpFile, HelpContext );
     if ( m_nNumber )
@@ -149,13 +149,12 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any
 
 // XDefaultProperty
 OUString SAL_CALL
-ErrObject::getDefaultPropertyName(  ) throw (uno::RuntimeException, std::exception)
+ErrObject::getDefaultPropertyName(  )
 {
     return OUString( "Number" );
 }
 
 void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext )
-    throw (uno::RuntimeException)
 {
     if ( !Number.hasValue() )
         throw uno::RuntimeException("Missing Required Parameter" );
@@ -198,7 +197,6 @@ SbxErrObject::getErrObject()
 }
 
 void SbxErrObject::setNumberAndDescription( ::sal_Int32 _number, const OUString& _description )
-    throw (uno::RuntimeException)
 {
     if( m_pErrObject != nullptr )
     {
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index e5c428e6493a..e900fa9bf527 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -148,18 +148,15 @@ public:
         : maBasicRef( pBasic ), m_xModel( xModel ) {}
 
     // Methods of XAllListener
-    virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent)
-        throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent)
-        throw( InvocationTargetException, RuntimeException, std::exception ) override;
+    virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) override;
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) override;
 
     // Methods of XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source)
-        throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 };
 
 // Methods XAllListener
-void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception )
+void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent )
 {
     SolarMutexGuard g;
 
@@ -167,7 +164,6 @@ void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw (
 }
 
 Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
-    throw ( InvocationTargetException, RuntimeException, std::exception )
 {
     SolarMutexGuard g;
 
@@ -177,7 +173,7 @@ Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
 }
 
 // Methods XEventListener
-void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
+void BasicScriptListener_Impl::disposing(const EventObject& )
 {
     // TODO: ???
     //SolarMutexGuard aGuard;
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 143ec4d8940a..1dc958879ddf 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -57,7 +57,7 @@ SbPropertyValues::~SbPropertyValues()
     m_xInfo.clear();
 }
 
-Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo()
 {
     // create on demand?
     if (!m_xInfo.is())
@@ -96,11 +96,6 @@ size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const
 void SbPropertyValues::setPropertyValue(
                     const OUString& aPropertyName,
                     const Any& aValue)
-                    throw (css::beans::UnknownPropertyException,
-                    css::beans::PropertyVetoException,
-                    css::lang::IllegalArgumentException,
-                    css::lang::WrappedTargetException,
-                    css::uno::RuntimeException, std::exception)
 {
     size_t const nIndex = GetIndex_Impl( aPropertyName );
     PropertyValue & rPropVal = m_aPropVals[nIndex];
@@ -110,9 +105,6 @@ void SbPropertyValues::setPropertyValue(
 
 Any SbPropertyValues::getPropertyValue(
                     const OUString& aPropertyName)
-                    throw(css::beans::UnknownPropertyException,
-                    css::lang::WrappedTargetException,
-                    css::uno::RuntimeException, std::exception)
 {
     size_t const nIndex = GetIndex_Impl( aPropertyName );
     return m_aPropVals[nIndex].Value;
@@ -122,7 +114,6 @@ Any SbPropertyValues::getPropertyValue(
 void SbPropertyValues::addPropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& )
-                    throw (std::exception)
 {
     (void)aPropertyName;
 }
@@ -131,7 +122,6 @@ void SbPropertyValues::addPropertyChangeListener(
 void SbPropertyValues::removePropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& )
-                    throw (std::exception)
 {
     (void)aPropertyName;
 }
@@ -140,7 +130,6 @@ void SbPropertyValues::removePropertyChangeListener(
 void SbPropertyValues::addVetoableChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XVetoableChangeListener >& )
-                    throw(std::exception)
 {
     (void)aPropertyName;
 }
@@ -149,24 +138,18 @@ void SbPropertyValues::addVetoableChangeListener(
 void SbPropertyValues::removeVetoableChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XVetoableChangeListener >& )
-                    throw(std::exception)
 {
     (void)aPropertyName;
 }
 
 
-Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (css::uno::RuntimeException, std::exception)
+Sequence< PropertyValue > SbPropertyValues::getPropertyValues()
 {
     return comphelper::containerToSequence(m_aPropVals);
 }
 
 
 void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPropertyValues )
-                     throw (css::beans::UnknownPropertyException,
-                     css::beans::PropertyVetoException,
-                     css::lang::IllegalArgumentException,
-                     css::lang::WrappedTargetException,
-                     css::uno::RuntimeException, std::exception)
 {
     if (!m_aPropVals.empty())
         throw IllegalArgumentException();
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index e5875224388a..66c1a94e562b 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -82,9 +82,9 @@ public:
         mbDisposed = bDisposed;
     }
 
-    virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) override;
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) override;
+    virtual void SAL_CALL disposing( const lang::EventObject& rSource ) override;
 
 private:
     StarBASIC&      mrDocBasic;
@@ -158,17 +158,17 @@ void DocBasicItem::stopListening()
     }
 }
 
-void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ )
 {
 }
 
-void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ )
 {
     stopListening();
     mbDocClosed = true;
 }
 
-void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ )
 {
     stopListening();
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index c1de49aa1dee..b85772631f74 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3826,11 +3826,11 @@ public:
     explicit BasicAllListener_Impl( const OUString& aPrefixName );
 
     // Methods of XAllListener
-    virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL firing(const AllEventObject& Event) override;
+    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) override;
 
     // Methods of XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 };
 
 
@@ -3890,12 +3890,12 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
 
 
 // Methods of Listener
-void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception )
+void BasicAllListener_Impl::firing( const AllEventObject& Event )
 {
     firing_impl( Event, nullptr );
 }
 
-Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException, std::exception )
+Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event )
 {
     Any aRetAny;
     firing_impl( Event, &aRetAny );
@@ -3904,7 +3904,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw (
 
 
 // Methods of XEventListener
-void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
+void BasicAllListener_Impl ::disposing(const EventObject& )
 {
     SolarMutexGuard guard;
 
@@ -3922,14 +3922,12 @@ public:
         const Reference< XAllListener >& AllListener, const Any& Helper );
 
     // XInvocation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
-        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override;
-    virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) override;
-    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override;
+    virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) override;
+    virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) override;
+    virtual Any SAL_CALL getValue(const OUString& PropertyName) override;
+    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) override;
+    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) override;
 
 private:
     Reference< XAllListener >    m_xAllListener;
@@ -3972,7 +3970,6 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper
 
 
 Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection()
-    throw( RuntimeException, std::exception )
 {
     return Reference< XIntrospectionAccess >();
 }
@@ -3980,8 +3977,6 @@ Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getInt
 
 Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, const Sequence< Any >& Params,
     Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException,
-        InvocationTargetException, RuntimeException, std::exception )
 {
     (void)OutParamIndex;
     (void)OutParam     ;
@@ -4033,8 +4028,6 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
 
 
 void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyName, const Any& Value)
-    throw( UnknownPropertyException, CannotConvertException,
-           InvocationTargetException, RuntimeException, std::exception )
 {
     (void)PropertyName;
     (void)Value;
@@ -4042,7 +4035,6 @@ void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyNa
 
 
 Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyName)
-    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     (void)PropertyName;
 
@@ -4051,7 +4043,6 @@ Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyNam
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     Reference< XIdlMethod > xMethod = m_xListenerType->getMethod( Name );
     return xMethod.is();
@@ -4059,7 +4050,6 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name)
-    throw( RuntimeException, std::exception )
 {
     Reference< XIdlField > xField = m_xListenerType->getField( Name );
     return xField.is();
@@ -4242,25 +4232,21 @@ public:
     ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj );
 
     // XInvocation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception) override;
-    virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue )
-        throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getValue( const OUString& rProperty )
-        throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override;
+    virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) override;
+    virtual Any SAL_CALL getValue( const OUString& rProperty ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) override;
 
     virtual Any SAL_CALL invoke( const OUString& rFunction,
                                  const Sequence< Any >& rParams,
                                  Sequence< sal_Int16 >& rOutParamIndex,
-                                 Sequence< Any >& rOutParam )
-        throw (CannotConvertException, InvocationTargetException,
-               RuntimeException, std::exception ) override;
+                                 Sequence< Any >& rOutParam ) override;
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL dispose() override;
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) override;
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override;
 };
 
 ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj )
@@ -4272,13 +4258,12 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject
     m_bProxyIsClassModuleObject = xScopeObj.Is() && nullptr != dynamic_cast<const SbClassModuleObject*>( xScopeObj.get() );
 }
 
-Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw(std::exception)
+Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection()
 {
     return Reference< XIntrospectionAccess >();
 }
 
 void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const Any& rValue)
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     if( !m_bProxyIsClassModuleObject )
         throw UnknownPropertyException();
@@ -4316,7 +4301,6 @@ void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const A
 }
 
 Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty)
-    throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     if( !m_bProxyIsClassModuleObject )
     {
@@ -4344,12 +4328,12 @@ Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty)
     return aRet;
 }
 
-sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw(std::exception)
+sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& )
 {
     return false;
 }
 
-sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw(std::exception)
+sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& )
 {
     return false;
 }
@@ -4358,8 +4342,6 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
                                             const Sequence< Any >& rParams,
                                             Sequence< sal_Int16 >&,
                                             Sequence< Any >& )
-    throw (CannotConvertException, InvocationTargetException,
-           RuntimeException, std::exception)
 {
     SolarMutexGuard guard;
 
@@ -4426,7 +4408,6 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
 }
 
 void SAL_CALL ModuleInvocationProxy::dispose()
-    throw(RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4437,13 +4418,11 @@ void SAL_CALL ModuleInvocationProxy::dispose()
 }
 
 void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     m_aListeners.addInterface( xListener );
 }
 
 void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     m_aListeners.removeInterface( xListener );
 }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 6f07eb3df5ca..dce7d98cdded 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -94,28 +94,28 @@ class DocObjectWrapper : public DocObjectWrapper_BASE
     Sequence< Type >           m_Types;
     SbModule*                m_pMod;
     /// @throws css::uno::RuntimeException
-    SbMethodRef getMethod( const OUString& aName ) throw (RuntimeException, std::exception);
+    SbMethodRef getMethod( const OUString& aName );
     /// @throws css::uno::RuntimeException
-    SbPropertyRef getProperty( const OUString& aName ) throw (RuntimeException, std::exception);
+    SbPropertyRef getProperty( const OUString& aName );
 
 public:
     explicit DocObjectWrapper( SbModule* pMod );
 
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) override
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override
     {
         return css::uno::Sequence<sal_Int8>();
     }
 
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (RuntimeException, std::exception) override;
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  ) override;
 
-    virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) override;
-    virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) override;
-    virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) override;
-    virtual  Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ) override;
+    virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) override;
+    virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) override;
+    virtual Any SAL_CALL getValue( const OUString& aPropertyName ) override;
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) override;
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) override;
+    virtual  Any SAL_CALL queryInterface( const Type& aType ) override;
 
-    virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ) override;
+    virtual Sequence< Type > SAL_CALL getTypes() override;
 };
 
 DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar )
@@ -170,7 +170,6 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar )
 }
 
 Sequence< Type > SAL_CALL DocObjectWrapper::getTypes()
-    throw ( RuntimeException, std::exception )
 {
     if ( m_Types.getLength() == 0 )
     {
@@ -197,13 +196,13 @@ Sequence< Type > SAL_CALL DocObjectWrapper::getTypes()
 }
 
 Reference< XIntrospectionAccess > SAL_CALL
-DocObjectWrapper::getIntrospection(  ) throw (RuntimeException, std::exception)
+DocObjectWrapper::getIntrospection(  )
 {
     return nullptr;
 }
 
 Any SAL_CALL
-DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception)
+DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasMethod( aFunctionName ) )
             return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam );
@@ -297,7 +296,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >&
 }
 
 void SAL_CALL
-DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception)
+DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue )
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasProperty( aPropertyName ) )
             return m_xAggInv->setValue( aPropertyName, aValue );
@@ -309,7 +308,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) t
 }
 
 Any SAL_CALL
-DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
+DocObjectWrapper::getValue( const OUString& aPropertyName )
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasProperty( aPropertyName ) )
             return m_xAggInv->getValue( aPropertyName );
@@ -327,7 +326,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownProper
 }
 
 sal_Bool SAL_CALL
-DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception)
+DocObjectWrapper::hasMethod( const OUString& aName )
 {
     if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) )
         return true;
@@ -335,7 +334,7 @@ DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, st
 }
 
 sal_Bool SAL_CALL
-DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception)
+DocObjectWrapper::hasProperty( const OUString& aName )
 {
     bool bRes = false;
     if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) )
@@ -345,7 +344,6 @@ DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException,
 }
 
 Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType )
-    throw ( RuntimeException, std::exception )
 {
     Any aRet = DocObjectWrapper_BASE::queryInterface( aType );
     if ( aRet.hasValue() )
@@ -355,7 +353,7 @@ Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType )
     return aRet;
 }
 
-SbMethodRef DocObjectWrapper::getMethod( const OUString& aName ) throw (RuntimeException, std::exception)
+SbMethodRef DocObjectWrapper::getMethod( const OUString& aName )
 {
     SbMethodRef pMethod = nullptr;
     if ( m_pMod )
@@ -370,7 +368,7 @@ SbMethodRef DocObjectWrapper::getMethod( const OUString& aName ) throw (RuntimeE
     return pMethod;
 }
 
-SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName ) throw (RuntimeException, std::exception)
+SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName )
 {
     SbPropertyRef pProperty = nullptr;
     if ( m_pMod )
@@ -2176,7 +2174,7 @@ SbObjModule::~SbObjModule()
 }
 
 void
-SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException, std::exception )
+SbObjModule::SetUnoObject( const uno::Any& aObj )
 {
     SbUnoObject* pUnoObj = dynamic_cast<SbUnoObject*>( pDocObject.get() );
     if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do
@@ -2300,7 +2298,7 @@ public:
         mxModel.clear();
     }
 
-    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) override
     {
         if ( mpUserForm )
         {
@@ -2315,7 +2313,7 @@ public:
     }
 
 
-    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) override
     {
 #ifdef IN_THE_FUTURE
         uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
@@ -2347,21 +2345,21 @@ public:
     }
 
 
-    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) override
     {
         mbOpened = false;
         mbShowing = false;
     }
 
-    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) override
     {
         if ( mpUserForm )
         {
@@ -2374,13 +2372,13 @@ public:
         }
     }
 
-    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) override
     {
         if ( mpUserForm )
             mpUserForm->triggerDeactivateEvent();
     }
 
-    virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) override
     {
         if ( mpUserForm )
         {
@@ -2389,21 +2387,21 @@ public:
         }
     }
 
-    virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) override
     {
         if ( mpUserForm )
             mpUserForm->triggerLayoutEvent();
     }
 
-    virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) override
     {
     }
 
-    virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) override
     {
         // early disposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate"
         if( rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::CLOSEDOC ) )
@@ -2415,7 +2413,7 @@ public:
         }
     }
 
-    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) override
+    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) override
     {
         SAL_INFO("basic", "** Userform/Dialog disposing");
         removeListener();
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 2955c5c2490c..2218b29d2665 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -46,8 +46,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
-    )
-        throw(css::uno::Exception) override;
+    ) override;
 
     virtual css::uno::Any SAL_CALL importLibraryElement
     (
@@ -73,23 +72,17 @@ public:
 
     // Methods XStorageBasedLibraryContainer
     virtual void SAL_CALL storeLibrariesToStorage(
-        const css::uno::Reference< css::embed::XStorage >& RootStorage )
-            throw (css::uno::RuntimeException,
-                   css::lang::WrappedTargetException,
-                   std::exception) override;
+        const css::uno::Reference< css::embed::XStorage >& RootStorage ) override;
 
     // Resource handling
     css::uno::Reference< css::resource::XStringResourcePersistence >
         implCreateStringResource( class SfxDialogLibrary* pDialog );
 
     // Methods XServiceInfo
-    virtual OUString SAL_CALL getImplementationName( )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName( ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
     // XLibraryQueryExecutable
-    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) override;
 };
 
 
@@ -135,7 +128,7 @@ public:
 
     // XStringResourceSupplier
     virtual css::uno::Reference< css::resource::XStringResourceResolver >
-        SAL_CALL getStringResource(  ) throw (css::uno::RuntimeException, std::exception) override;
+        SAL_CALL getStringResource(  ) override;
 
     const OUString& getName()
         { return m_aName; }
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 07ac40f7e788..65c4722e3319 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -36,8 +36,7 @@ public:
     static css::uno::Reference< ooo::vba::XErrObject > const & getUnoErrObject();
 
     /// @throws css::uno::RuntimeException
-    void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description )
-        throw (css::uno::RuntimeException);
+    void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description );
 };
 #endif
 
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 832061d69f03..cd785d0877c2 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -98,65 +98,36 @@ public:
     /// @throws css::container::ElementExistException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void insertCheck(const OUString& aName, const css::uno::Any& aElement)
-        throw (css::lang::IllegalArgumentException,
-               css::container::ElementExistException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception);
+    void insertCheck(const OUString& aName, const css::uno::Any& aElement);
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
-    void insertNoCheck(const OUString& aName, const css::uno::Any& aElement)
-        throw (css::lang::IllegalArgumentException,
-               css::lang::WrappedTargetException,
-               css::uno::RuntimeException, std::exception);
+    void insertNoCheck(const OUString& aName, const css::uno::Any& aElement);
 
     // Methods XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // Methods XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::ElementExistException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // Methods XContainer
-    virtual void SAL_CALL addContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener ) override;
+    virtual void SAL_CALL removeContainerListener( const css::uno::Reference<css::container::XContainerListener >& xListener ) override;
 
     // Methods XChangesNotifier
-    virtual void SAL_CALL addChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener ) override;
+    virtual void SAL_CALL removeChangesListener( const css::uno::Reference<css::util::XChangesListener >& xListener ) override;
 };
 
 
@@ -202,8 +173,7 @@ public:
 private:
     virtual bool implTypedNotify(
         const css::uno::Reference< css::script::vba::XVBAScriptListener >& rxListener,
-        const css::script::vba::VBAScriptEvent& rEvent )
-        throw (css::uno::Exception) override;
+        const css::script::vba::VBAScriptEvent& rEvent ) override;
 };
 
 
@@ -300,8 +270,7 @@ protected:
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
-    )
-        throw(css::uno::Exception) = 0;
+    ) = 0;
 
     virtual css::uno::Any SAL_CALL importLibraryElement
     (
@@ -324,9 +293,7 @@ protected:
     /// @throws css::lang::WrappedTargetException
     /// @throws css::uno::RuntimeException
     virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name,
-                                          bool bVerifyPasswordOnly=false )
-            throw(css::lang::WrappedTargetException,
-                  css::uno::RuntimeException, std::exception);
+                                          bool bVerifyPasswordOnly=false );
 
     virtual void onNewRootStorage() = 0;
 
@@ -357,8 +324,7 @@ protected:
         OUString& aUnexpandedStorageURL
     );
     /// @throws css::uno::RuntimeException
-    OUString expand_url( const OUString& url )
-        throw(css::uno::RuntimeException);
+    OUString expand_url( const OUString& url );
 
     SfxLibrary* getImplLib( const OUString& rLibraryName );
 
@@ -394,146 +360,85 @@ public:
     static void leaveMethod();
 
     // Methods XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements()
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType() override;
+    virtual sal_Bool SAL_CALL hasElements() override;
 
     // Methods XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Members XStorageBasedLibraryContainer
-    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() override;
+    virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) override;
+    virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) override;
 
     // Methods XModifiable (base of XPersistentLibraryContainer)
-    virtual sal_Bool SAL_CALL isModified(  ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isModified(  ) override;
+    virtual void SAL_CALL setModified( sal_Bool bModified ) override;
+    virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
+    virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
 
     // Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer)
-    virtual css::uno::Any SAL_CALL getRootLocation() throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getContainerLocationName() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL storeLibraries(  ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getRootLocation() override;
+    virtual OUString SAL_CALL getContainerLocationName() override;
+    virtual void SAL_CALL storeLibraries(  ) override;
 
     //Methods XLibraryContainer3
-    virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name ) override;
 
     // Methods XLibraryContainer2 (base of XPersistentLibraryContainer)
-    virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName )
-        throw (css::container::NoSuchElementException,
-               css::container::ElementExistException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name ) override;
+    virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name ) override;
+    virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) override;
+    virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName ) override;
 
     // Methods XLibraryContainer (base of XLibraryContainer2)
     virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL
-        createLibrary( const OUString& Name )
-            throw(css::lang::IllegalArgumentException,
-                  css::container::ElementExistException,
-                  css::uno::RuntimeException, std::exception) override;
+        createLibrary( const OUString& Name ) override;
     virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL createLibraryLink
-        ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly )
-            throw(css::lang::IllegalArgumentException,
-                  css::container::ElementExistException,
-                  css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeLibrary( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL loadLibrary( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+        ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) override;
+    virtual void SAL_CALL removeLibrary( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name ) override;
+    virtual void SAL_CALL loadLibrary( const OUString& Name ) override;
 
     // Methods XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence<
-        css::uno::Any >& aArguments )
-            throw (css::uno::Exception,
-                   css::uno::RuntimeException, std::exception) override;
+        css::uno::Any >& aArguments ) override;
 
     // Methods XLibraryContainerPassword
-    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) override;
     virtual void SAL_CALL changeLibraryPassword( const OUString& Name,
-        const OUString& OldPassword, const OUString& NewPassword )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& OldPassword, const OUString& NewPassword ) override;
 
     // Methods XContainer
     virtual void SAL_CALL addContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
     virtual void SAL_CALL removeContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
 
     // Methods XLibraryContainerExport
     virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL,
-        const css::uno::Reference< css::task::XInteractionHandler >& Handler )
-            throw (css::uno::Exception,
-                   css::container::NoSuchElementException,
-                   css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
 
     // Methods XServiceInfo
-    virtual OUString SAL_CALL getImplementationName( )
-        throw (css::uno::RuntimeException, std::exception) override = 0;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
-        throw (css::uno::RuntimeException, std::exception) override = 0;
+    virtual OUString SAL_CALL getImplementationName( ) override = 0;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override = 0;
     // Methods XVBACompatibility
-    virtual sal_Bool SAL_CALL getVBACompatibilityMode() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual OUString SAL_CALL getProjectName() throw (css::uno::RuntimeException, std::exception) override { return msProjectName; }
-    virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getRunningVBAScripts()
-            throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL getVBACompatibilityMode() override;
+    virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) override;
+    virtual OUString SAL_CALL getProjectName() override { return msProjectName; }
+    virtual void SAL_CALL setProjectName( const OUString& _projectname ) override;
+    virtual sal_Int32 SAL_CALL getRunningVBAScripts() override;
     virtual void SAL_CALL addVBAScriptListener(
-        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) override;
     virtual void SAL_CALL removeVBAScriptListener(
-        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener )
-            throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName )
-            throw (css::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) override;
+    virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) override;
 };
 
 
@@ -636,65 +541,41 @@ public:
     );
 
     // Methods XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override;
     virtual void SAL_CALL acquire() throw() override { OComponentHelper::acquire(); }
     virtual void SAL_CALL release() throw() override { OComponentHelper::release(); }
 
     // Methods XElementAccess
-    virtual css::uno::Type SAL_CALL getElementType(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasElements(  )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Type SAL_CALL getElementType(  ) override;
+    virtual sal_Bool SAL_CALL hasElements(  ) override;
 
     // Methods XNameAccess
-    virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  )
-        throw(css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
-        throw(css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(  ) override;
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
 
     // Methods XNameReplace
-    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
 
     // Methods XNameContainer
-    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
-        throw(css::lang::IllegalArgumentException,
-              css::container::ElementExistException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeByName( const OUString& Name )
-        throw(css::container::NoSuchElementException,
-              css::lang::WrappedTargetException,
-              css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+    virtual void SAL_CALL removeByName( const OUString& Name ) override;
 
     // XTypeProvider
-    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  )
-        throw( css::uno::RuntimeException, std::exception ) override;
-    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  )
-        throw( css::uno::RuntimeException, std::exception ) override;
+    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
+    css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) override;
 
     // Methods XContainer
     virtual void SAL_CALL addContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
     virtual void SAL_CALL removeContainerListener( const css::uno::Reference<
-        css::container::XContainerListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::container::XContainerListener >& xListener ) override;
 
     // Methods XChangesNotifier
     virtual void SAL_CALL addChangesListener( const css::uno::Reference<
-        css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::util::XChangesListener >& xListener ) override;
     virtual void SAL_CALL removeChangesListener( const css::uno::Reference<
-        css::util::XChangesListener >& xListener )
-            throw (css::uno::RuntimeException, std::exception) override;
+        css::util::XChangesListener >& xListener ) override;
 
 public:
     struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } };
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index 1488625498bb..a3c79e6cdee8 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -48,39 +48,27 @@ public:
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-        getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override;
+        getPropertySetInfo() override;
     virtual void SAL_CALL   setPropertyValue(
                                 const OUString& aPropertyName,
-                                const css::uno::Any& aValue)
-                                throw (css::beans::UnknownPropertyException,
-                                css::beans::PropertyVetoException,
-                                css::lang::IllegalArgumentException,
-                                css::lang::WrappedTargetException,
-                                css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
-        throw(  css::beans::UnknownPropertyException,
-                css::lang::WrappedTargetException,
-                css::uno::RuntimeException, std::exception) override;
+                                const css::uno::Any& aValue) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
     virtual void SAL_CALL   addPropertyChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override;
     virtual void SAL_CALL   removePropertyChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XPropertyChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override;
     virtual void SAL_CALL   addVetoableChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override;
     virtual void SAL_CALL   removeVetoableChangeListener(
                                 const OUString& aPropertyName,
-                                const css::uno::Reference< css::beans::XVetoableChangeListener >& )
-                                throw (std::exception) override;
+                                const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override;
 
     // XPropertyAccess
-    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() override;
+    virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) override;
 };
 
 class StarBASIC;
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 341b4828d4c2..e727ecccd02a 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -46,8 +46,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
         const css::uno::Reference< css::container::XNameContainer>& xLibrary,
         const OUString& aElementName,
         const css::uno::Reference< css::io::XOutputStream >& xOutput
-    )
-        throw(css::uno::Exception) override;
+    ) override;
 
     virtual css::uno::Any SAL_CALL importLibraryElement
     (
@@ -72,9 +71,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas
                         const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
 
     virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name,
-                                          bool bVerifyPasswordOnly=false )
-            throw(css::lang::WrappedTargetException,
-                  css::uno::RuntimeException, std::exception) override;
+                                          bool bVerifyPasswordOnly=false ) override;
 
     virtual void onNewRootStorage() override;
 
@@ -93,30 +90,16 @@ public:
 
 
     // Methods XLibraryContainerPassword
-    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name )
-        throw (css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) override;
+    virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) override;
     virtual void SAL_CALL changeLibraryPassword( const OUString& Name,
-        const OUString& OldPassword, const OUString& NewPassword )
-        throw (css::lang::IllegalArgumentException,
-               css::container::NoSuchElementException,
-               css::uno::RuntimeException, std::exception) override;
+        const OUString& OldPassword, const OUString& NewPassword ) override;
     // XLibraryQueryExecutable
-    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&)
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) override;
     // Methods XServiceInfo
-    virtual OUString SAL_CALL getImplementationName( )
-        throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual OUString SAL_CALL getImplementationName( ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
 };
 
 
@@ -161,10 +144,10 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XVBAModuleInfo
-    virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) override;
+    virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) override;
+    virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) override;
+    virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) override;
 
     static bool containsValidModule( const css::uno::Any& _rElement );
 
diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx
index eefff5d46645..7e2432e43b15 100644
--- a/basic/source/runtime/comenumwrapper.cxx
+++ b/basic/source/runtime/comenumwrapper.cxx
@@ -22,7 +22,6 @@
 using namespace ::com::sun::star;
 
 sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
-    throw ( uno::RuntimeException, std::exception )
 {
     bool bResult = false;
 
@@ -41,9 +40,6 @@ sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements()
 }
 
 uno::Any SAL_CALL ComEnumerationWrapper::nextElement()
-    throw ( container::NoSuchElementException,
-            lang::WrappedTargetException,
-            uno::RuntimeException, std::exception )
 {
     try
     {
diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx
index f1267ca9618f..8af4e164b06c 100644
--- a/basic/source/runtime/comenumwrapper.hxx
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -38,8 +38,8 @@ public:
     }
 
     // container::XEnumeration
-    virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL hasMoreElements() override;
+    virtual css::uno::Any SAL_CALL nextElement() override;
 };
 
 #endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index fb90243ebaa2..a1a1f05f57b4 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -152,7 +152,6 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
     const OUString& aElementName,
     const Reference< XOutputStream >& xOutput
 )
-    throw(Exception)
 {
     Any aElement = xLib->getByName( aElementName );
     Reference< XInputStreamProvider > xISP;
@@ -185,7 +184,7 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
     xInput->closeInput();
 }
 
-void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException, WrappedTargetException, std::exception )
+void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage )
 {
     LibraryContainerMethodGuard aGuard( *this );
     mbOasis2OOoFormat = false;
@@ -444,19 +443,19 @@ void SfxDialogLibraryContainer::onNewRootStorage()
 }
 
 sal_Bool SAL_CALL
-SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) throw (uno::RuntimeException, std::exception)
+SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ )
 {
     return false; // dialog library has no executable code
 }
 
 // Service
 
-OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException, std::exception)
+OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( )
 {
     return OUString("com.sun.star.comp.sfx2.DialogLibraryContainer");
 }
 
-Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( )
 {
     return {"com.sun.star.script.DocumentDialogLibraryContainer",
             "com.sun.star.script.DialogLibraryContainer"}; // for compatibility
@@ -554,7 +553,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const css::uno::Reference< css::
 
 // XStringResourceSupplier
 Reference< resource::XStringResourceResolver >
-    SAL_CALL SfxDialogLibrary::getStringResource(  ) throw (RuntimeException, std::exception)
+    SAL_CALL SfxDialogLibrary::getStringResource(  )
 {
     if( !m_xStringResourcePersistence.is() )
         m_xStringResourcePersistence = m_pParent->implCreateStringResource( this );
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index bc706067a172..ae579545f74b 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -99,13 +99,11 @@ static bool GbMigrationSuppressErrors = false;
 
 // Methods XElementAccess
 Type NameContainer::getElementType()
-    throw(RuntimeException, std::exception)
 {
     return mType;
 }
 
 sal_Bool NameContainer::hasElements()
-    throw(RuntimeException, std::exception)
 {
     bool bRet = (mnElementCount > 0);
     return bRet;
@@ -113,7 +111,6 @@ sal_Bool NameContainer::hasElements()
 
 // Methods XNameAccess
 Any NameContainer::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     if( aIt == mHashMap.end() )
@@ -126,13 +123,11 @@ Any NameContainer::getByName( const OUString& aName )
 }
 
 Sequence< OUString > NameContainer::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     return comphelper::containerToSequence(mNames);
 }
 
 sal_Bool NameContainer::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     bool bRet = ( aIt != mHashMap.end() );
@@ -142,7 +137,6 @@ sal_Bool NameContainer::hasByName( const OUString& aName )
 
 // Methods XNameReplace
 void NameContainer::replaceByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     const Type& aAnyType = aElement.getValueType();
     if( mType != aAnyType )
@@ -187,7 +181,6 @@ void NameContainer::replaceByName( const OUString& aName, const Any& aElement )
 }
 
 void NameContainer::insertCheck(const OUString& aName, const Any& aElement)
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find(aName);
     if( aIt != mHashMap.end() )
@@ -198,7 +191,6 @@ void NameContainer::insertCheck(const OUString& aName, const Any& aElement)
 }
 
 void NameContainer::insertNoCheck(const OUString& aName, const Any& aElement)
-    throw(IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     const Type& aAnyType = aElement.getValueType();
     if( mType != aAnyType )
@@ -240,13 +232,11 @@ void NameContainer::insertNoCheck(const OUString& aName, const Any& aElement)
 
 // Methods XNameContainer
 void NameContainer::insertByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     insertCheck(aName, aElement);
 }
 
 void NameContainer::removeByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     NameContainerNameMap::iterator aIt = mHashMap.find( aName );
     if( aIt == mHashMap.end() )
@@ -298,7 +288,6 @@ void NameContainer::removeByName( const OUString& aName )
 
 // Methods XContainer
 void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -309,7 +298,6 @@ void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerLi
 }
 
 void SAL_CALL NameContainer::removeContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -321,7 +309,6 @@ void SAL_CALL NameContainer::removeContainerListener( const Reference< XContaine
 
 // Methods XChangesNotifier
 void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -332,7 +319,6 @@ void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListen
 }
 
 void SAL_CALL NameContainer::removeChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     if( !xListener.is() )
     {
@@ -368,7 +354,6 @@ VBAScriptListenerContainer::VBAScriptListenerContainer( ::osl::Mutex& rMutex ) :
 }
 
 bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScriptListener >& rxListener, const vba::VBAScriptEvent& rEvent )
-    throw (Exception)
 {
     rxListener->notifyVBAScriptEvent( rEvent );
     return true;    // notify all other listeners too
@@ -444,14 +429,13 @@ BasicManager* SfxLibraryContainer::getBasicManager()
 }
 
 // Methods XStorageBasedLibraryContainer
-Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() throw (RuntimeException, std::exception)
+Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return mxStorage;
 }
 
 void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& _rxRootStorage )
-    throw (IllegalArgumentException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if ( !_rxRootStorage.is() )
@@ -463,7 +447,6 @@ void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >&
 }
 
 void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XStorage >& _rxRootStorage )
-    throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if ( !_rxRootStorage.is() )
@@ -484,7 +467,6 @@ void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XSt
 
 // Methods XModifiable
 sal_Bool SfxLibraryContainer::isModified()
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if ( maModifiable.isModified() )
@@ -527,41 +509,37 @@ sal_Bool SfxLibraryContainer::isModified()
 }
 
 void SAL_CALL SfxLibraryContainer::setModified( sal_Bool _bModified )
-    throw (PropertyVetoException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maModifiable.setModified( _bModified );
 }
 
 void SAL_CALL SfxLibraryContainer::addModifyListener( const Reference< XModifyListener >& _rxListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maModifiable.addModifyListener( _rxListener );
 }
 
 void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModifyListener >& _rxListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maModifiable.removeModifyListener( _rxListener );
 }
 
 // Methods XPersistentLibraryContainer
-Any SAL_CALL SfxLibraryContainer::getRootLocation() throw (RuntimeException, std::exception)
+Any SAL_CALL SfxLibraryContainer::getRootLocation()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return makeAny( getRootStorage() );
 }
 
-OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() throw (RuntimeException, std::exception)
+OUString SAL_CALL SfxLibraryContainer::getContainerLocationName()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maLibrariesDir;
 }
 
 void SAL_CALL SfxLibraryContainer::storeLibraries(  )
-    throw (WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     try
@@ -1362,7 +1340,6 @@ bool SfxLibraryContainer::implLoadPasswordLibrary(
     SfxLibrary* /*pLib*/,
     const OUString& /*Name*/,
     bool /*bVerifyPasswordOnly*/ )
-throw(WrappedTargetException, RuntimeException, std::exception)
 {
     return true;
 }
@@ -2180,14 +2157,12 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
 
 // Methods XElementAccess
 Type SAL_CALL SfxLibraryContainer::getElementType()
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maNameContainer->getElementType();
 }
 
 sal_Bool SfxLibraryContainer::hasElements()
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     bool bRet = maNameContainer->hasElements();
@@ -2196,7 +2171,6 @@ sal_Bool SfxLibraryContainer::hasElements()
 
 // Methods XNameAccess
 Any SfxLibraryContainer::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     Any aRetAny = maNameContainer->getByName( aName ) ;
@@ -2204,14 +2178,12 @@ Any SfxLibraryContainer::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SfxLibraryContainer::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maNameContainer->getElementNames();
 }
 
 sal_Bool SfxLibraryContainer::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return maNameContainer->hasByName( aName ) ;
@@ -2219,7 +2191,6 @@ sal_Bool SfxLibraryContainer::hasByName( const OUString& aName )
 
 // Methods XLibraryContainer
 Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const OUString& Name )
-    throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pNewLib = implCreateLibrary( Name );
@@ -2238,7 +2209,6 @@ Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const O
 
 Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
     ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly )
-    throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     // TODO: Check other reasons to force ReadOnly status
@@ -2286,7 +2256,6 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
 }
 
 void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     // Get and hold library before removing
@@ -2357,7 +2326,6 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name )
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name )
-    throw(NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2367,7 +2335,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name )
 
 
 void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     Any aLibAny = maNameContainer->getByName( Name ) ;
@@ -2508,7 +2475,6 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
 
 // Methods XLibraryContainer2
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2517,7 +2483,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name )
 }
 
 OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2531,7 +2496,6 @@ OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name )
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2540,7 +2504,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name )
 }
 
 void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2564,7 +2527,6 @@ void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal
 }
 
 void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OUString& NewName )
-    throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     if( maNameContainer->hasByName( NewName ) )
@@ -2696,7 +2658,6 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
 
 // Methods XInitialization
 void SAL_CALL SfxLibraryContainer::initialize( const Sequence< Any >& _rArguments )
-    throw (Exception, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     sal_Int32 nArgCount = _rArguments.getLength();
@@ -2772,28 +2733,24 @@ void SAL_CALL SfxLibraryContainer::disposing()
 
 // Methods XLibraryContainerPassword
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordProtected( const OUString& )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     return false;
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordVerified( const OUString& )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     throw IllegalArgumentException();
 }
 
 sal_Bool SAL_CALL SfxLibraryContainer::verifyLibraryPassword( const OUString&, const OUString& )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     throw IllegalArgumentException();
 }
 
 void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const OUString&, const OUString& )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     throw IllegalArgumentException();
@@ -2801,7 +2758,6 @@ void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const
 
 // Methods XContainer
 void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maNameContainer->setEventSource( static_cast< XInterface* >( static_cast<OWeakObject*>(this) ) );
@@ -2809,7 +2765,6 @@ void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XConta
 }
 
 void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     maNameContainer->removeContainerListener( xListener );
@@ -2818,7 +2773,6 @@ void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XCo
 // Methods XLibraryContainerExport
 void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL,
     const Reference< XInteractionHandler >& Handler )
-    throw ( uno::Exception, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2854,7 +2808,6 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU
 }
 
 OUString SfxLibraryContainer::expand_url( const OUString& url )
-    throw(css::uno::RuntimeException)
 {
     if (url.startsWithIgnoreAsciiCase( "vnd.sun.star.expand:" ))
     {
@@ -2873,7 +2826,6 @@ OUString SfxLibraryContainer::expand_url( const OUString& url )
 
 //XLibraryContainer3
 OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString& Name )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -2888,12 +2840,12 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString
 
 
 // XVBACompatibility
-sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode()
 {
     return mbVBACompat;
 }
 
-void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatmodeon )
 {
     /*  The member variable mbVBACompat must be set first, the following call
         to getBasicManager() may call getVBACompatibilityMode() which returns
@@ -2930,7 +2882,7 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatm
     }
 }
 
-void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname )
 {
     msProjectName = _projectname;
     BasicManager* pBasMgr = getBasicManager();
@@ -2944,23 +2896,23 @@ void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname
     }
 }
 
-sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() throw (RuntimeException, std::exception)
+sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts()
 {
     LibraryContainerMethodGuard aGuard( *this );
     return mnRunningVBAScripts;
 }
 
-void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener )
 {
     maVBAScriptListeners.addTypedListener( rxListener );
 }
 
-void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener )
 {
     maVBAScriptListeners.removeTypedListener( rxListener );
 }
 
-void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) throw (RuntimeException, std::exception)
+void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName )
 {
     // own lock for accessing the number of running scripts
     enterMethod();
@@ -2982,7 +2934,6 @@ void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifie
 
 // Methods XServiceInfo
 sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServiceName )
-    throw (RuntimeException, std::exception)
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -3055,7 +3006,6 @@ void SfxLibrary::implSetModified( bool _bIsModified )
 
 // Methods XInterface
 Any SAL_CALL SfxLibrary::queryInterface( const Type& rType )
-    throw( RuntimeException, std::exception )
 {
     Any aRet;
 
@@ -3076,13 +3026,11 @@ Any SAL_CALL SfxLibrary::queryInterface( const Type& rType )
 
 // Methods XElementAccess
 Type SfxLibrary::getElementType()
-    throw(RuntimeException, std::exception)
 {
     return maNameContainer->getElementType();
 }
 
 sal_Bool SfxLibrary::hasElements()
-    throw(RuntimeException, std::exception)
 {
     bool bRet = maNameContainer->hasElements();
     return bRet;
@@ -3090,7 +3038,6 @@ sal_Bool SfxLibrary::hasElements()
 
 // Methods XNameAccess
 Any SfxLibrary::getByName( const OUString& aName )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkLoaded();
 
@@ -3099,13 +3046,11 @@ Any SfxLibrary::getByName( const OUString& aName )
 }
 
 Sequence< OUString > SfxLibrary::getElementNames()
-    throw(RuntimeException, std::exception)
 {
     return maNameContainer->getElementNames();
 }
 
 sal_Bool SfxLibrary::hasByName( const OUString& aName )
-    throw(RuntimeException, std::exception)
 {
     bool bRet = maNameContainer->hasByName( aName );
     return bRet;
@@ -3140,7 +3085,6 @@ void SfxLibrary::impl_checkLoaded()
 
 // Methods XNameReplace
 void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkReadOnly();
     impl_checkLoaded();
@@ -3156,7 +3100,6 @@ void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement )
 
 // Methods XNameContainer
 void SfxLibrary::insertByName( const OUString& aName, const Any& aElement )
-    throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkReadOnly();
     impl_checkLoaded();
@@ -3199,7 +3142,6 @@ void SfxLibrary::impl_removeWithoutChecks( const OUString& _rElementName )
 }
 
 void SfxLibrary::removeByName( const OUString& Name )
-    throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     impl_checkReadOnly();
     impl_checkLoaded();
@@ -3208,7 +3150,6 @@ void SfxLibrary::removeByName( const OUString& Name )
 
 // XTypeProvider
 Sequence< Type > SfxLibrary::getTypes()
-    throw( RuntimeException, std::exception )
 {
     static OTypeCollection * s_pTypes_NameContainer = nullptr;
     if( !s_pTypes_NameContainer )
@@ -3229,35 +3170,30 @@ Sequence< Type > SfxLibrary::getTypes()
 
 
 Sequence< sal_Int8 > SfxLibrary::getImplementationId()
-    throw( RuntimeException, std::exception )
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
 // Methods XContainer
 void SAL_CALL SfxLibrary::addContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->setEventSource( static_cast< XInterface* >( static_cast<OWeakObject*>(this) ) );
     maNameContainer->addContainerListener( xListener );
 }
 
 void SAL_CALL SfxLibrary::removeContainerListener( const Reference< XContainerListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->removeContainerListener( xListener );
 }
 
 // Methods XChangesNotifier
 void SAL_CALL SfxLibrary::addChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->setEventSource( static_cast< XInterface* >( static_cast<OWeakObject*>(this) ) );
     maNameContainer->addChangesListener( xListener );
 }
 
 void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListener >& xListener )
-    throw (RuntimeException, std::exception)
 {
     maNameContainer->removeChangesListener( xListener );
 }
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index b50153e7eb2e..07f8935595e5 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -152,7 +152,6 @@ bool SAL_CALL SfxScriptLibraryContainer::isLibraryElementValid(const Any& rEleme
 void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement( const Reference < XNameContainer >& xLib,
                                                               const OUString& aElementName,
                                                               const Reference< XOutputStream >& xOutput)
-    throw(Exception)
 {
     // Create sax writer
     Reference< XWriter > xWriter = xml::sax::Writer::create(mxContext);
@@ -357,7 +356,6 @@ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& a
 
 // Methods XLibraryContainerPassword
 sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name )
-    throw (NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -366,7 +364,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const O
 }
 
 sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name )
-    throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -380,7 +377,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
 
 sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword
     ( const OUString& Name, const OUString& Password )
-        throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -423,7 +419,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword
 void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& Name,
                                                                 const OUString& OldPassword,
                                                                 const OUString& NewPassword )
-        throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
 {
     LibraryContainerMethodGuard aGuard( *this );
     SfxLibrary* pImplLib = getImplLib( Name );
@@ -856,7 +851,6 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
 
 bool SfxScriptLibraryContainer::implLoadPasswordLibrary
     ( SfxLibrary* pLib, const OUString& Name, bool bVerifyPasswordOnly )
-        throw(WrappedTargetException, RuntimeException, std::exception)
 {
     bool bRet = true;
 
@@ -1150,7 +1144,6 @@ void SfxScriptLibraryContainer::onNewRootStorage()
 }
 
 sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString& Library )
-    throw (uno::RuntimeException, std::exception)
 {
     BasicManager* pBasicMgr = getBasicManager();
     OSL_ENSURE( pBasicMgr, "we need a basicmanager, really we do" );
@@ -1165,13 +1158,11 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString&
 
 // Service
 OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( )
-    throw (RuntimeException, std::exception)
 {
     return OUString("com.sun.star.comp.sfx2.ScriptLibraryContainer" );
 }
 
 Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceNames( )
-    throw (RuntimeException, std::exception)
 {
     return {"com.sun.star.script.DocumentScriptLibraryContainer",
             "com.sun.star.script.ScriptLibraryContainer"}; // for compatibility
@@ -1254,7 +1245,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BA
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE );
 
 script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& ModuleName )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
     if ( !hasModuleInfo( ModuleName ) )
     {
@@ -1264,7 +1254,6 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod
 }
 
 sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName )
-    throw (RuntimeException, std::exception)
 {
     bool bRes = false;
     ModuleInfoMap::iterator it = mModuleInfo.find( ModuleName );
@@ -1277,7 +1266,6 @@ sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName )
 }
 
 void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, const script::ModuleInfo& ModuleInfo )
-    throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
 {
     if ( hasModuleInfo( ModuleName ) )
     {
@@ -1287,7 +1275,6 @@ void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, co
 }
 
 void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName )
-    throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
 {
         // #FIXME add NoSuchElementException to the spec
     if ( !hasModuleInfo( ModuleName ) )