Remove dynamic exception specifications

...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
author: Stephan Bergmann <sbergman@redhat.com> 2017-01-26 12:28:58 +0100
committer: Stephan Bergmann <sbergman@redhat.com> 2017-01-26 12:54:43 +0000
commit: e57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
tree: bcce66b27261553c308779f3e8663a269ed3a671 /svx/source/form
parent: 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
21 files changed, 244 insertions, 257 deletions
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index 813f51a73612..7b50b9f065d7 100644
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
@@ -45,23 +45,23 @@ namespace svxform
     }
 
     // XContainerListener
-    void SAL_CALL DataListener::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::elementInserted( const ContainerEvent& /*Event*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
-    void SAL_CALL DataListener::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::elementRemoved( const ContainerEvent& /*Event*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
-    void SAL_CALL DataListener::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::elementReplaced( const ContainerEvent& /*Event*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
     // XFrameActionListener
-    void SAL_CALL DataListener::frameAction( const FrameActionEvent& rActionEvt ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::frameAction( const FrameActionEvent& rActionEvt )
     {
         if ( FrameAction_COMPONENT_ATTACHED == rActionEvt.Action ||
              FrameAction_COMPONENT_REATTACHED == rActionEvt.Action )
@@ -71,13 +71,13 @@ namespace svxform
     }
 
     // xml::dom::events::XEventListener
-    void SAL_CALL DataListener::handleEvent( const Reference< XEvent >& /*evt*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::handleEvent( const Reference< XEvent >& /*evt*/ )
     {
         m_pNaviWin->NotifyChanges();
     }
 
     // lang::XEventListener
-    void SAL_CALL DataListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL DataListener::disposing( const EventObject& /*Source*/ )
     {
         SAL_WARN( "svx.form", "disposing" );
     }
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 3c1116a83494..374324049f97 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -242,16 +242,16 @@ public:
     FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexAccess >& xControllers);
 
 // XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL disposing(const EventObject& Source) override;
 
 // XFilterControllerListener
-    virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
-    virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
+    virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& Event ) override;
+    virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& Event ) override;
+    virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& Event ) override;
 
 // helpers
     /// @throws RuntimeException
-    void dispose() throw( RuntimeException );
+    void dispose();
 
     void AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd );
 
@@ -269,7 +269,7 @@ FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexA
 }
 
 
-void FmFilterAdapter::dispose() throw( RuntimeException )
+void FmFilterAdapter::dispose()
 {
     AddOrRemoveListener( m_xControllers, false );
 }
@@ -318,7 +318,7 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos,
 
 // XEventListener
 
-void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( RuntimeException, std::exception )
+void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/)
 {
 }
 
@@ -358,7 +358,7 @@ namespace
 
 // XFilterControllerListener
 
-void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) throw( RuntimeException, std::exception )
+void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -409,7 +409,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) thr
 }
 
 
-void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event )
 {
     SolarMutexGuard aGuard;
 
@@ -444,7 +444,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event
 }
 
 
-void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception)
+void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event )
 {
     SolarMutexGuard aGuard;
 
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index a3c96f8fdc9c..32700e9d70f3 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -28,7 +28,7 @@
 using namespace ::svxform;
 
 
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception )
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier)
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xRet;
     if ( rServiceSpecifier.startsWith( "com.sun.star.form.component." ) )
@@ -47,7 +47,7 @@ using namespace ::svxform;
 }
 
 
-::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames()
 {
     static const OUStringLiteral aSvxComponentServiceNameList[] =
     {
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 8ce3e23b3ab9..8d87f611b368 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -38,12 +38,12 @@ SvxFmDrawPage::~SvxFmDrawPage() throw ()
 {
 }
 
-css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType )
 {
     Any aRet = ::cppu::queryInterface   (   _rType
                                         ,   static_cast< XFormsSupplier2* >( this )
@@ -55,7 +55,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) thr
     return aRet;
 }
 
-css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes(  ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes(  )
 {
     css::uno::Sequence< css::uno::Type > aTypes(SvxDrawPage::getTypes());
     aTypes.realloc(aTypes.getLength() + 1);
@@ -66,7 +66,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes(  ) throw(
 }
 
 SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xDescr )
-    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aShapeType( xDescr->getShapeType() );
 
@@ -80,7 +79,6 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw
 }
 
 css::uno::Reference< css::drawing::XShape >  SvxFmDrawPage::CreateShape( SdrObject *pObj ) const
-    throw (css::uno::RuntimeException, std::exception)
 {
     if( SdrInventor::FmForm == pObj->GetObjInventor() )
     {
@@ -92,7 +90,7 @@ css::uno::Reference< css::drawing::XShape >  SvxFmDrawPage::CreateShape( SdrObje
 }
 
 // XFormsSupplier
-css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( css::uno::RuntimeException, std::exception )
+css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms()
 {
     css::uno::Reference< css::container::XNameContainer >  xForms;
 
@@ -104,7 +102,7 @@ css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::ge
 }
 
 // XFormsSupplier2
-sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( css::uno::RuntimeException, std::exception )
+sal_Bool SAL_CALL SvxFmDrawPage::hasForms()
 {
     bool bHas = false;
     FmFormPage* pFormPage = dynamic_cast<FmFormPage*>( GetSdrPage()  );
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 59b8c209f695..0c39405586d8 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -73,7 +73,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans ) throw(RuntimeException, std::exception)
+    void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans )
     {
         TransferableHelper::implCallOwnLostOwnership( _rxClipboard, _rxTrans );
         m_bClipboardOwner = false;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 9f12a2ad9c53..b58c364e661d 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -88,10 +88,10 @@ namespace svxform
         explicit FormScriptListener( FormScriptingEnvironment * pScriptExecutor );
 
         // XScriptListener
-        virtual void SAL_CALL firing( const ScriptEvent& aEvent ) throw (RuntimeException, std::exception) override;
-        virtual Any SAL_CALL approveFiring( const ScriptEvent& aEvent ) throw (InvocationTargetException, RuntimeException, std::exception) override;
+        virtual void SAL_CALL firing( const ScriptEvent& aEvent ) override;
+        virtual Any SAL_CALL approveFiring( const ScriptEvent& aEvent ) override;
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
 
         // lifetime control
         void SAL_CALL dispose();
@@ -722,7 +722,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent )
     {
        if ( _rEvent.ScriptType == "VBAInterop" )
            return; // not handled here
@@ -743,7 +743,7 @@ namespace svxform
     }
 
 
-    Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent ) throw (InvocationTargetException, RuntimeException, std::exception)
+    Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent )
     {
         Any aResult;
 
@@ -755,7 +755,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ )
     {
         // not interested in
     }
@@ -785,8 +785,7 @@ namespace svxform
             bool mbQuitBlocked;
         public:
             // XTerminateListener
-            virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/)
-                throw(css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override
+            virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/) override
             {
                 mbQuitBlocked = true;
 #if HAVE_FEATURE_SCRIPTING
@@ -795,16 +794,14 @@ namespace svxform
                 throw css::frame::TerminationVetoException();
             }
 
-            virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/)
-                throw(css::uno::RuntimeException, std::exception) override
+            virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/) override
             {
                 mbQuitBlocked = false;
             }
 
             using cppu::WeakComponentImplHelperBase::disposing;
 
-            virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
-                throw(css::uno::RuntimeException, std::exception) override
+            virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override
             {
                 const bool bShutDown = (rEvent.Source == m_xDesktop);
                 if (bShutDown && m_xDesktop.is())
@@ -815,20 +812,17 @@ namespace svxform
             }
 
             // XServiceInfo
-            virtual OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual OUString SAL_CALL getImplementationName() override
             {
                 return OUString("com.sun.star.comp.svx.StarBasicQuitGuard");
             }
 
-            virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
             {
                 return cppu::supportsService(this, ServiceName);
             }
 
-            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
-                throw (css::uno::RuntimeException, std::exception) override
+            virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
             {
                 css::uno::Sequence<OUString> aSeq { "com.sun.star.svx.StarBasicQuitGuard" };
                 return aSeq;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 218adc06c597..4db230f93b1a 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -733,7 +733,7 @@ bool FmXFormShell::IsReadonlyDoc() const
 
 //  EventListener
 
-void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e)
 {
 
     if (m_xActiveController == e.Source)
@@ -771,7 +771,7 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime
 }
 
 
-void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -836,7 +836,7 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu
 }
 
 
-void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent)
 {
     if ( impl_checkDisposed() )
         return;
@@ -847,7 +847,7 @@ void SAL_CALL FmXFormShell::formActivated(const lang::EventObject& rEvent) throw
 }
 
 
-void SAL_CALL FmXFormShell::formDeactivated(const lang::EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormShell::formDeactivated(const lang::EventObject& rEvent)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2486,7 +2486,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextIn
 
   // XContainerListener
 
-void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::elementInserted(const ContainerEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2501,7 +2501,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::Ru
 }
 
 
-void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::elementReplaced(const ContainerEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2514,7 +2514,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::Ru
 }
 
 
-void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::elementRemoved(const ContainerEvent& evt)
 {
     if ( impl_checkDisposed() )
         return;
@@ -2622,7 +2622,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem
 }
 
 
-void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception)
+void FmXFormShell::selectionChanged(const lang::EventObject& rEvent)
 {
     if ( impl_checkDisposed() )
         return;
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 10a9b75a8b00..1e1d3aa337c5 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -111,7 +111,7 @@ void FmRecordCountListener::DisConnect()
 }
 
 
-void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception )
+void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/)
 {
     DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::disposing should never have been called without a propset !");
     DisConnect();
@@ -129,7 +129,7 @@ void FmRecordCountListener::NotifyCurrentCount()
 }
 
 
-void FmRecordCountListener::propertyChange(const  css::beans::PropertyChangeEvent& /*evt*/) throw(css::uno::RuntimeException, std::exception)
+void FmRecordCountListener::propertyChange(const  css::beans::PropertyChangeEvent& /*evt*/)
 {
     NotifyCurrentCount();
 }
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index feea0056f88b..4f1d69215730 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -81,7 +81,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState )
     {
         m_aFeatureState   = _rState.State;
         m_bFeatureEnabled = _rState.IsEnabled;
@@ -91,7 +91,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ )
     {
         // nothing to do
     }
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 3f170ff0c61a..724a831188b8 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -177,9 +177,9 @@ namespace svx
         virtual ~FmFocusListenerAdapter() override;
 
     protected:
-        virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override;
+        virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
     };
 
 
@@ -223,21 +223,21 @@ namespace svx
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::focusGained( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::focusGained( const css::awt::FocusEvent& e )
     {
         if ( m_pObserver )
             m_pObserver->focusGained( e );
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::focusLost( const css::awt::FocusEvent& e ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::focusLost( const css::awt::FocusEvent& e )
     {
         if ( m_pObserver )
             m_pObserver->focusLost( e );
     }
 
 
-    void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source )
     {
         (void)Source;
         DBG_ASSERT( Source.Source == m_xWindow, "FmFocusListenerAdapter::disposing: where did this come from?" );
@@ -262,11 +262,11 @@ namespace svx
         virtual ~FmMouseListenerAdapter() override;
 
     protected:
-        virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override;
+        virtual void SAL_CALL disposing( const EventObject& Source ) override;
     };
 
     FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< css::awt::XControl >& _rxControl, IContextRequestObserver* _pObserver )
@@ -309,7 +309,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mousePressed( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mousePressed( const css::awt::MouseEvent& _rEvent )
     {
         SolarMutexGuard aGuard;
         // is this a request for a context menu?
@@ -321,25 +321,25 @@ namespace svx
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseReleased( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseReleased( const css::awt::MouseEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseEntered( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseEntered( const css::awt::MouseEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::mouseExited( const css::awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::mouseExited( const css::awt::MouseEvent& /*e*/ )
     {
         // not interested in
     }
 
 
-    void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException, std::exception)
+    void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source )
     {
         (void)Source;
         DBG_ASSERT( Source.Source == m_xWindow, "FmMouseListenerAdapter::disposing: where did this come from?" );
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 1c4805299b8a..8555605d170d 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -300,7 +300,7 @@ FmXDisposeMultiplexer::~FmXDisposeMultiplexer()
 
 // css::lang::XEventListener
 
-void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception )
+void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source)
 {
     Reference< css::lang::XEventListener> xPreventDelete(this);
 
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 6963b0db8cee..3ae443c30f74 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -79,17 +79,17 @@ class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener
 {
 public:
     /// @throws css::uno::RuntimeException
-    explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException )
+    explicit ScriptEventListenerWrapper( FmFormModel& _rModel)
         :m_rModel( _rModel )
         ,m_attemptedListenerCreation( false )
     {
 
     }
     // XEventListener
-    virtual void SAL_CALL disposing(const EventObject& ) throw( RuntimeException, std::exception ) override {}
+    virtual void SAL_CALL disposing(const EventObject& ) override {}
 
     // XScriptListener
-    virtual void SAL_CALL firing(const  ScriptEvent& evt) throw(RuntimeException, std::exception) override
+    virtual void SAL_CALL firing(const  ScriptEvent& evt) override
     {
         attemptListenerCreation();
         if ( m_vbaListener.is() )
@@ -98,7 +98,7 @@ public:
         }
     }
 
-    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( css::reflection::InvocationTargetException, RuntimeException, std::exception) override
+    virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) override
     {
         attemptListenerCreation();
         if ( m_vbaListener.is() )
@@ -509,7 +509,7 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj)
 
 //  XEventListener
 
-void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException, std::exception )
+void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e)
 {
     // check if it's an object we have cached information about
     if (m_pPropertySetCache)
@@ -527,7 +527,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime
 
 // XPropertyChangeListener
 
-void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -722,7 +722,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
 
 // XContainerListener
 
-void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -746,7 +746,7 @@ void FmXUndoEnvironment::implSetModified()
 }
 
 
-void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -763,7 +763,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr
 }
 
 
-void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -776,7 +776,7 @@ void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) thro
 }
 
 
-void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ )
 {
     implSetModified();
 }
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index bac41bc254fb..35742d528b2f 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -219,23 +219,23 @@ void FormViewPageWindowAdapter::dispose()
     m_aControllerList.clear();
 }
 
-sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements()
 {
     return getCount() != 0;
 }
 
-Type SAL_CALL  FormViewPageWindowAdapter::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL  FormViewPageWindowAdapter::getElementType()
 {
     return cppu::UnoType<XFormController>::get();
 }
 
 // XIndexAccess
-sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount()
 {
     return m_aControllerList.size();
 }
 
-Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex)
 {
     if (nIndex < 0 ||
         nIndex >= getCount())
@@ -246,7 +246,7 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde
     return aElement;
 }
 
-void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& Control ) throw (RuntimeException, std::exception)
+void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& Control )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -461,7 +461,7 @@ FmXFormView::~FmXFormView()
 
 //      EventListener
 
-void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::disposing(const EventObject& Source)
 {
     if ( m_xWindow.is() && Source.Source == m_xWindow )
     {
@@ -476,14 +476,14 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx
 
 // XFormControllerListener
 
-void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent)
 {
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formActivated( rEvent );
 }
 
 
-void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent)
 {
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formDeactivated( rEvent );
@@ -491,7 +491,7 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run
 
 // XContainerListener
 
-void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt)
 {
     try
     {
@@ -519,13 +519,13 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run
 }
 
 
-void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt)
 {
     elementInserted(evt);
 }
 
 
-void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException, std::exception )
+void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/)
 {
 }
 
@@ -1903,7 +1903,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
     }
 }
 
-void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ )
 {
     if ( m_xWindow.is() && m_pView )
     {
@@ -1911,7 +1911,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
     }
 }
 
-void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ )
 {
     // when switch the focus outside the office the mark didn't change
     // so we can not remove us as focus listener
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 3a09dccfa87a..668125ff2dc8 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -99,7 +99,6 @@ using namespace ::dbtools;
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL
     FormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB )
-    throw (css::uno::Exception)
 {
     return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) );
 }
@@ -430,11 +429,11 @@ public:
     const Sequence< PropertyValue >&   getValues() const { return m_aValues; }
 
 // XInteractionSupplyParameters
-    virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) override;
+    virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override;
 };
 
 
-void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception)
+void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
 {
     m_aValues = _rValues;
 }
@@ -463,14 +462,14 @@ public:
     }
 
     virtual OUString GetComponentServiceName() override {return OUString("Edit");}
-    virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException, std::exception ) override;
+    virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) override;
 
 protected:
     virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) override;
 };
 
 
-void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException, std::exception )
+void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer )
 {
     UnoControl::createPeer( rxToolkit, rParentPeer );
 
@@ -627,7 +626,7 @@ void SAL_CALL FormController::release() throw ()
 }
 
 
-Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL FormController::queryInterface( const Type& _rType )
 {
     Any aRet = FormController_BASE::queryInterface( _rType );
     if ( !aRet.hasValue() )
@@ -638,12 +637,12 @@ Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeE
 }
 
 
-Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() throw( RuntimeException, std::exception )
+Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId()
 {
     return css::uno::Sequence<sal_Int8>();
 }
 
-Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL FormController::getTypes(  )
 {
     return comphelper::concatSequences(
         FormController_BASE::getTypes(),
@@ -652,17 +651,17 @@ Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException, s
 }
 
 // XServiceInfo
-sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException, std::exception )
+OUString SAL_CALL FormController::getImplementationName()
 {
     return OUString("org.openoffice.comp.svx.FormController");
 }
 
-Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( RuntimeException, std::exception )
+Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames()
 {
     // service names which are supported only, but cannot be used to created an
     // instance at a service factory
@@ -674,13 +673,13 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( R
 }
 
 
-sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/)
 {
     return true;
 }
 
 
-void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::resetted(const EventObject& rEvent)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     if (getCurrentControl().is() &&  (getCurrentControl()->getModel() == rEvent.Source))
@@ -764,14 +763,12 @@ void FormController::impl_setTextOnAllFilter_throw()
 
 sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/,
                                             sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
-                throw( IllegalArgumentException )
 {
     return false;
 }
 
 
 void FormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
-                         throw( Exception, std::exception )
 {
 }
 
@@ -855,7 +852,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
 }
 
 
-Reference< XPropertySetInfo >  FormController::getPropertySetInfo() throw( RuntimeException, std::exception )
+Reference< XPropertySetInfo >  FormController::getPropertySetInfo()
 {
     static Reference< XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -887,19 +884,19 @@ void FormController::fillProperties(
 
 // XFilterController
 
-void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& Listener )
 {
     m_aFilterListeners.addInterface( Listener );
 }
 
 
-void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& Listener )
 {
     m_aFilterListeners.removeInterface( Listener );
 }
 
 
-::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( css::uno::RuntimeException, std::exception )
+::sal_Int32 SAL_CALL FormController::getFilterComponents()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -908,7 +905,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
 }
 
 
-::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( css::uno::RuntimeException, std::exception )
+::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -917,7 +914,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
 }
 
 
-void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
+void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -936,7 +933,7 @@ void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::s
 }
 
 
-Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
+Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -948,7 +945,7 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component
 }
 
 
-Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException, std::exception )
+Sequence< Sequence< OUString > > FormController::getPredicateExpressions()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -981,7 +978,7 @@ Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw
 }
 
 
-void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term )
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1022,7 +1019,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) throw (I
 }
 
 
-void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeException, std::exception)
+void SAL_CALL FormController::appendEmptyDisjunctiveTerm()
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1033,7 +1030,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti
 }
 
 
-::sal_Int32 SAL_CALL FormController::getActiveTerm() throw (RuntimeException, std::exception)
+::sal_Int32 SAL_CALL FormController::getActiveTerm()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1042,7 +1039,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti
 }
 
 
-void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1059,14 +1056,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) throw (Ind
 
 // XElementAccess
 
-sal_Bool SAL_CALL FormController::hasElements() throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::hasElements()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return !m_aChildren.empty();
 }
 
 
-Type SAL_CALL  FormController::getElementType() throw( RuntimeException, std::exception )
+Type SAL_CALL  FormController::getElementType()
 {
     return cppu::UnoType<XFormController>::get();
 
@@ -1074,7 +1071,7 @@ Type SAL_CALL  FormController::getElementType() throw( RuntimeException, std::ex
 
 // XEnumerationAccess
 
-Reference< XEnumeration > SAL_CALL  FormController::createEnumeration() throw( RuntimeException, std::exception )
+Reference< XEnumeration > SAL_CALL  FormController::createEnumeration()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return new ::comphelper::OEnumerationByIndex(this);
@@ -1082,14 +1079,14 @@ Reference< XEnumeration > SAL_CALL  FormController::createEnumeration() throw( R
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL FormController::getCount() throw( RuntimeException, std::exception )
+sal_Int32 SAL_CALL FormController::getCount()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_aChildren.size();
 }
 
 
-Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+Any SAL_CALL FormController::getByIndex(sal_Int32 Index)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (Index < 0 ||
@@ -1101,7 +1098,7 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBounds
 
 //  EventListener
 
-void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::disposing(const EventObject& e)
 {
     // Ist der Container disposed worden
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1231,7 +1228,7 @@ namespace
 }
 
 
-void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     if ( evt.PropertyName == FM_PROP_BOUNDFIELD )
@@ -1441,7 +1438,7 @@ IMPL_LINK_NOARG(FormController, OnToggleAutoFields, void*, void)
 
 // XTextListener
 
-void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::textChanged(const TextEvent& e)
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1498,7 +1495,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce
 
 // XItemListener
 
-void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     impl_onModify();
@@ -1506,7 +1503,7 @@ void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) thro
 
 // XModificationBroadcaster
 
-void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1514,7 +1511,7 @@ void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener
 }
 
 
-void FormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException, std::exception )
+void FormController::removeModifyListener(const Reference< XModifyListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1523,7 +1520,7 @@ void FormController::removeModifyListener(const Reference< XModifyListener > & l
 
 // XModificationListener
 
-void FormController::modified( const EventObject& _rEvent ) throw( RuntimeException, std::exception )
+void FormController::modified( const EventObject& _rEvent )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
@@ -1616,7 +1613,7 @@ bool FormController::determineLockState() const
 
 //  FocusListener
 
-void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, std::exception )
+void FormController::focusGained(const FocusEvent& e)
 {
     // SYNCHRONIZED -->
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1769,7 +1766,7 @@ IMPL_LINK_NOARG( FormController, OnDeactivated, void*, void )
 }
 
 
-void FormController::focusLost(const FocusEvent& e) throw( RuntimeException, std::exception )
+void FormController::focusLost(const FocusEvent& e)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
 
@@ -1786,31 +1783,31 @@ void FormController::focusLost(const FocusEvent& e) throw( RuntimeException, std
 }
 
 
-void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ )
 {
     // not interested in
 }
 
 
-void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ )
 {
     // not interested in
 }
 
 
-void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent )
 {
     m_pControlBorderManager->mouseEntered( _rEvent.Source );
 }
 
 
-void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent )
 {
     m_pControlBorderManager->mouseExited( _rEvent.Source );
 }
 
 
-void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource )
 {
     Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), false, false ) );
     Reference< XValidatableFormComponent > xValidatable( _rSource.Source, UNO_QUERY );
@@ -1822,7 +1819,7 @@ void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSou
 }
 
 
-void FormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException, std::exception )
+void FormController::setModel(const Reference< XTabControllerModel > & Model)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -1935,7 +1932,7 @@ void FormController::setModel(const Reference< XTabControllerModel > & Model) th
 }
 
 
-Reference< XTabControllerModel >  FormController::getModel() throw( RuntimeException, std::exception )
+Reference< XTabControllerModel >  FormController::getModel()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2001,7 +1998,7 @@ void FormController::removeFromEventAttacher(const Reference< XControl > & xCont
 }
 
 
-void FormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException, std::exception )
+void FormController::setContainer(const Reference< XControlContainer > & xContainer)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     Reference< XTabControllerModel >  xTabModel(getModel());
@@ -2086,7 +2083,7 @@ void FormController::setContainer(const Reference< XControlContainer > & xContai
 }
 
 
-Reference< XControlContainer >  FormController::getContainer() throw( RuntimeException, std::exception )
+Reference< XControlContainer >  FormController::getContainer()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2098,7 +2095,7 @@ Reference< XControlContainer >  FormController::getContainer() throw( RuntimeExc
 }
 
 
-Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeException, std::exception )
+Sequence< Reference< XControl > > FormController::getControls()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2138,7 +2135,7 @@ Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeEx
 }
 
 
-void FormController::autoTabOrder() throw( RuntimeException, std::exception )
+void FormController::autoTabOrder()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2149,7 +2146,7 @@ void FormController::autoTabOrder() throw( RuntimeException, std::exception )
 }
 
 
-void FormController::activateTabOrder() throw( RuntimeException, std::exception )
+void FormController::activateTabOrder()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2538,7 +2535,7 @@ void FormController::removeControl(const Reference< XControl > & xControl)
 
 // XLoadListener
 
-void FormController::loaded(const EventObject& rEvent) throw( RuntimeException, std::exception )
+void FormController::loaded(const EventObject& rEvent)
 {
     OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FormController::loaded: where did this come from?" );
 
@@ -2620,7 +2617,7 @@ IMPL_LINK_NOARG(FormController, OnLoad, void*, void)
 }
 
 
-void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException, std::exception )
+void FormController::unloaded(const EventObject& /*rEvent*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2629,7 +2626,7 @@ void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeExcep
 }
 
 
-void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void FormController::reloading(const EventObject& /*aEvent*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2641,7 +2638,7 @@ void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeExce
 }
 
 
-void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException, std::exception )
+void FormController::reloaded(const EventObject& aEvent)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2650,7 +2647,7 @@ void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException
 }
 
 
-void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void FormController::unloading(const EventObject& /*aEvent*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2659,7 +2656,7 @@ void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeExce
 }
 
 
-void FormController::unload() throw( RuntimeException )
+void FormController::unload()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2768,7 +2765,7 @@ void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm
 
 // css::sdbc::XRowSetListener
 
-void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void FormController::cursorMoved(const EventObject& /*event*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2789,12 +2786,12 @@ void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeExc
 }
 
 
-void FormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void FormController::rowChanged(const EventObject& /*event*/)
 {
     // not interested in ...
 }
 
-void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException, std::exception )
+void FormController::rowSetChanged(const EventObject& /*event*/)
 {
     // not interested in ...
 }
@@ -2802,7 +2799,7 @@ void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeE
 
 // XContainerListener
 
-void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::elementInserted(const ContainerEvent& evt)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2848,7 +2845,7 @@ void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw(
 }
 
 
-void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt)
 {
     // simulate an elementRemoved
     ContainerEvent aRemoveEvent( evt );
@@ -2863,7 +2860,7 @@ void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw(
 }
 
 
-void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2909,7 +2906,7 @@ Reference< XControl >  FormController::isInList(const Reference< XWindowPeer > &
 }
 
 
-void FormController::activateFirst() throw( RuntimeException, std::exception )
+void FormController::activateFirst()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2920,7 +2917,7 @@ void FormController::activateFirst() throw( RuntimeException, std::exception )
 }
 
 
-void FormController::activateLast() throw( RuntimeException, std::exception )
+void FormController::activateLast()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2932,7 +2929,7 @@ void FormController::activateLast() throw( RuntimeException, std::exception )
 
 // XFormController
 
-Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw (RuntimeException, std::exception)
+Reference< XFormOperations > SAL_CALL FormController::getFormOperations()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2941,7 +2938,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw
 }
 
 
-Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( RuntimeException, std::exception )
+Reference< XControl> SAL_CALL FormController::getCurrentControl()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2949,14 +2946,14 @@ Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( Runtime
 }
 
 
-void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
     m_aActivateListeners.addInterface(l);
 }
 
-void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -2964,7 +2961,7 @@ void SAL_CALL FormController::removeActivateListener(const Reference< XFormContr
 }
 
 
-void SAL_CALL FormController::addChildController( const Reference< XFormController >& ChildController ) throw( RuntimeException, IllegalArgumentException, std::exception )
+void SAL_CALL FormController::addChildController( const Reference< XFormController >& ChildController )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3001,7 +2998,7 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll
 }
 
 
-Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw (RuntimeException, std::exception)
+Reference< XFormControllerContext > SAL_CALL FormController::getContext()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3009,7 +3006,7 @@ Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw
 }
 
 
-void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3017,7 +3014,7 @@ void SAL_CALL FormController::setContext( const Reference< XFormControllerContex
 }
 
 
-Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler() throw (RuntimeException, std::exception)
+Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3025,7 +3022,7 @@ Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler(
 }
 
 
-void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3436,7 +3433,7 @@ void FormController::stopFiltering()
 
 // XModeSelector
 
-void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception )
+void FormController::setMode(const OUString& Mode)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3464,7 +3461,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru
 }
 
 
-OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::exception )
+OUString SAL_CALL FormController::getMode()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3473,7 +3470,7 @@ OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::except
 }
 
 
-Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL FormController::getSupportedModes()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3489,7 +3486,7 @@ Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( Runtime
 }
 
 
-sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3653,7 +3650,7 @@ namespace
 
 // XRowSetApproveListener
 
-sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3741,7 +3738,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
 }
 
 
-sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3758,7 +3755,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th
 }
 
 
-sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3776,7 +3773,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event)
 
 // XRowSetApproveBroadcaster
 
-void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3785,7 +3782,7 @@ void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetA
 }
 
 
-void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3795,7 +3792,7 @@ void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowS
 
 // XErrorListener
 
-void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3816,7 +3813,7 @@ void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( R
 
 // XErrorBroadcaster
 
-void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3825,7 +3822,7 @@ void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorList
 }
 
 
-void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3835,7 +3832,7 @@ void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorL
 
 // XDatabaseParameterBroadcaster2
 
-void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3844,7 +3841,7 @@ void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDat
 }
 
 
-void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3854,20 +3851,20 @@ void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< X
 
 // XDatabaseParameterBroadcaster
 
-void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     FormController::addDatabaseParameterListener( aListener );
 }
 
 
-void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener)
 {
     FormController::removeDatabaseParameterListener( aListener );
 }
 
 // XDatabaseParameterListener
 
-sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3945,7 +3942,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent&
 
 // XConfirmDeleteBroadcaster
 
-void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3954,7 +3951,7 @@ void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirm
 }
 
 
-void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -3964,7 +3961,7 @@ void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConf
 
 // XConfirmDeleteListener
 
-sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
@@ -4026,7 +4023,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
 }
 
 
-void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& Features )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     // for now, just copy the ids of the features, because ....
@@ -4040,7 +4037,7 @@ void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >&
 }
 
 
-void SAL_CALL FormController::invalidateAllFeatures(  ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::invalidateAllFeatures(  )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -4055,7 +4052,6 @@ void SAL_CALL FormController::invalidateAllFeatures(  ) throw (RuntimeException,
 Reference< XDispatch >
 FormController::interceptedQueryDispatch( const URL& aURL,
                                             const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/)
-                                            throw( RuntimeException )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
     Reference< XDispatch >  xReturn;
@@ -4094,7 +4090,7 @@ FormController::interceptedQueryDispatch( const URL& aURL,
 }
 
 
-void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs )
 {
     if ( _rArgs.getLength() != 1 )
     {
@@ -4122,7 +4118,7 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper
 }
 
 
-void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL )
 {
     if (_rURL.Complete == FMURL_CONFIRM_DELETION)
     {
@@ -4140,19 +4136,19 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene
 }
 
 
-Reference< XInterface > SAL_CALL FormController::getParent() throw( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL FormController::getParent()
 {
     return m_xParent;
 }
 
 
-void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent) throw( NoSupportException, RuntimeException, std::exception )
+void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent)
 {
     m_xParent = Parent;
 }
 
 
-void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL )
 {
     (void)_rURL;
     OSL_ENSURE(_rURL.Complete == FMURL_CONFIRM_DELETION, "FormController::removeStatusListener: invalid (unsupported) URL!");
@@ -4192,7 +4188,7 @@ bool FormController::ensureInteractionHandler()
 }
 
 
-void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest )
 {
     if ( !ensureInteractionHandler() )
         return;
@@ -4234,7 +4230,7 @@ void FormController::implInvalidateCurrentControlDependentFeatures()
 }
 
 
-void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ )
 {
     implInvalidateCurrentControlDependentFeatures();
 }
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index b4bd0f3dedb9..ccfde930f8a4 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -381,7 +381,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& Features )
     {
         if ( !m_pInvalidationCallback )
             // nobody's interested in ...
@@ -399,7 +399,7 @@ namespace svx
     }
 
 
-    void SAL_CALL FormControllerHelper::invalidateAllFeatures() throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::invalidateAllFeatures()
     {
         if ( !m_pInvalidationCallback )
             // nobody's interested in ...
@@ -442,14 +442,14 @@ namespace svx
     }
 
 
-    void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& Event ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& Event )
     {
         OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" );
         m_aOperationError = Event.Reason;
     }
 
 
-    void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException, std::exception)
+    void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ )
     {
         // not interested in
     }
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 52802221cf02..e490119fa7a7 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -70,7 +70,7 @@ namespace svxform
     }
 
 
-    Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException, std::exception)
+    Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         Reference< XDispatch> xResult;
@@ -87,7 +87,7 @@ namespace svxform
 
 
     Sequence< Reference< XDispatch > > SAL_CALL
-    DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) throw(RuntimeException, std::exception)
+    DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength());
@@ -101,35 +101,35 @@ namespace svxform
     }
 
 
-    Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider(  ) throw(RuntimeException, std::exception)
+    Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider(  )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         return m_xSlaveDispatcher;
     }
 
 
-    void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider) throw( RuntimeException, std::exception )
+    void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider)
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         m_xSlaveDispatcher = xNewDispatchProvider;
     }
 
 
-    Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider() throw( RuntimeException, std::exception )
+    Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider()
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         return m_xMasterDispatcher;
     }
 
 
-    void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier) throw( RuntimeException, std::exception )
+    void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier)
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         m_xMasterDispatcher = xNewSupplier;
     }
 
 
-    void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+    void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source)
     {
         if (m_bListening)
         {
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 1e0688dd08db..bfda3c7a54c8 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -119,7 +119,7 @@ namespace svx
     }
 
 
-    void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception)
+    void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments )
     {
         ::osl::ClearableMutexGuard aGuard( m_rMutex );
 
@@ -157,7 +157,7 @@ namespace svx
     }
 
 
-    void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception)
+    void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL )
     {
         (void)_rURL;
         OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::addStatusListener: unexpected URL!" );
@@ -174,7 +174,7 @@ namespace svx
     }
 
 
-    void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException, std::exception)
+    void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL )
     {
         (void)_rURL;
         OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::removeStatusListener: unexpected URL!" );
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index c8ff1c2f170e..85b26fff6b78 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -76,114 +76,114 @@ namespace svxform
         }
 
         // form::XFormController
-        virtual Reference< XControl > SAL_CALL getCurrentControl(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL addActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL removeActivateListener( const Reference< form::XFormControllerListener >& l ) throw (RuntimeException, std::exception) override;
+        virtual Reference< XControl > SAL_CALL getCurrentControl(  ) override;
+        virtual void SAL_CALL addActivateListener( const Reference< form::XFormControllerListener >& l ) override;
+        virtual void SAL_CALL removeActivateListener( const Reference< form::XFormControllerListener >& l ) override;
 
         // awt::XTabController
-        virtual void SAL_CALL setModel( const Reference< XTabControllerModel >& Model ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XTabControllerModel > SAL_CALL getModel(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL setContainer( const Reference< XControlContainer >& Container ) throw (RuntimeException, std::exception) override;
-        virtual Reference< XControlContainer > SAL_CALL getContainer(  ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< Reference< XControl > > SAL_CALL getControls(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL autoTabOrder(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL activateTabOrder(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL activateFirst(  ) throw (RuntimeException, std::exception) override;
-        virtual void SAL_CALL activateLast(  ) throw (RuntimeException, std::exception) override;
+        virtual void SAL_CALL setModel( const Reference< XTabControllerModel >& Model ) override;
+        virtual Reference< XTabControllerModel > SAL_CALL getModel(  ) override;
+        virtual void SAL_CALL setContainer( const Reference< XControlContainer >& Container ) override;
+        virtual Reference< XControlContainer > SAL_CALL getContainer(  ) override;
+        virtual Sequence< Reference< XControl > > SAL_CALL getControls(  ) override;
+        virtual void SAL_CALL autoTabOrder(  ) override;
+        virtual void SAL_CALL activateTabOrder(  ) override;
+        virtual void SAL_CALL activateFirst(  ) override;
+        virtual void SAL_CALL activateLast(  ) override;
 
         // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException, std::exception) override;
-        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException, std::exception) override;
+        virtual OUString SAL_CALL getImplementationName(  ) override;
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
     private:
         const Reference< form::runtime::XFormController >   m_xDelegator;
     };
 
 
-    Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl(  ) throw (RuntimeException, std::exception)
+    Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl(  )
     {
         return m_xDelegator->getCurrentControl();
     }
 
 
-    void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener )
     {
         m_xDelegator->addActivateListener( _listener );
     }
 
 
-    void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener )
     {
         m_xDelegator->removeActivateListener( _listener );
     }
 
 
-    void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model )
     {
         m_xDelegator->setModel( _model );
     }
 
 
-    Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel(  ) throw (RuntimeException, std::exception)
+    Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel(  )
     {
         return m_xDelegator->getModel();
     }
 
 
-    void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container )
     {
         m_xDelegator->setContainer( _container );
     }
 
 
-    Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer(  ) throw (RuntimeException, std::exception)
+    Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer(  )
     {
         return m_xDelegator->getContainer();
     }
 
 
-    Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls(  ) throw (RuntimeException, std::exception)
+    Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls(  )
     {
         return m_xDelegator->getControls();
     }
 
 
-    void SAL_CALL LegacyFormController::autoTabOrder(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::autoTabOrder(  )
     {
         m_xDelegator->autoTabOrder();
     }
 
 
-    void SAL_CALL LegacyFormController::activateTabOrder(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::activateTabOrder(  )
     {
         m_xDelegator->activateTabOrder();
     }
 
 
-    void SAL_CALL LegacyFormController::activateFirst(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::activateFirst(  )
     {
         m_xDelegator->activateFirst();
     }
 
 
-    void SAL_CALL LegacyFormController::activateLast(  ) throw (RuntimeException, std::exception)
+    void SAL_CALL LegacyFormController::activateLast(  )
     {
         m_xDelegator->activateLast();
     }
 
 
-    OUString SAL_CALL LegacyFormController::getImplementationName(  ) throw (RuntimeException, std::exception)
+    OUString SAL_CALL LegacyFormController::getImplementationName(  )
     {
         return OUString( "org.openoffice.comp.svx.LegacyFormController" );
     }
 
-    sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception)
+    sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName )
     {
         return cppu::supportsService(this, _serviceName);
     }
 
-    Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames(  ) throw (RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames(  )
     {
         Sequence< OUString > aServices(2);
         aServices.getArray()[0] = "com.sun.star.form.FormController";
@@ -195,7 +195,6 @@ namespace svxform
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL
     LegacyFormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB )
-    throw (css::uno::Exception)
 {
     return ::svxform::LegacyFormController::Create( _rxORB );
 }
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 6cd10d247b9f..2af1e9f1ce8e 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -61,13 +61,13 @@ namespace svxform
 
     // XPropertyChangeListener
 
-    void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
+    void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source)
     {
         Remove( Source.Source );
     }
 
 
-    void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt)
     {
         if( !m_pNavModel ) return;
         if( evt.PropertyName != FM_PROP_NAME ) return;
@@ -92,7 +92,7 @@ namespace svxform
 
     // XContainerListener
 
-    void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt)
     {
         if (IsLocked() || !m_pNavModel)
             return;
@@ -131,7 +131,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt)
     {
         if (IsLocked() || !m_pNavModel)
             return;
@@ -179,7 +179,7 @@ namespace svxform
     }
 
 
-    void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) throw(RuntimeException, std::exception)
+    void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt)
     {
         Reference< XInterface > xElement;
         evt.Element >>= xElement;
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 91e7e89caa8e..d44ec744b416 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -257,7 +257,7 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt )
 }
 
 
-void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception )
+void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt)
 {
     css::uno::Reference< css::form::XForm >  xForm(evt.Source, css::uno::UNO_QUERY);
     UpdateContent(xForm);
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index d65eff71b535..9f2cc14413a2 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -100,7 +100,7 @@ namespace svxform
     }
 
 
-    Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId(  ) throw(RuntimeException, std::exception)
+    Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId(  )
     {
         return css::uno::Sequence<sal_Int8>();
     }
@@ -112,19 +112,19 @@ namespace svxform
     }
 
 
-    OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException, std::exception)
+    OUString SAL_CALL OAddConditionDialog::getImplementationName()
     {
         return OAddConditionDialog_GetImplementationName();
     }
 
 
-    Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException, std::exception)
+    Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames()
     {
         return OAddConditionDialog_GetSupportedServiceNames();
     }
 
 
-    Reference<XPropertySetInfo>  SAL_CALL OAddConditionDialog::getPropertySetInfo() throw(RuntimeException, std::exception)
+    Reference<XPropertySetInfo>  SAL_CALL OAddConditionDialog::getPropertySetInfo()
     {
         return createPropertySetInfo( getInfoHelper() );
     }
author	Stephan Bergmann <sbergman@redhat.com>	2017-01-26 12:28:58 +0100
committer	Stephan Bergmann <sbergman@redhat.com>	2017-01-26 12:54:43 +0000
commit	e57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
tree	bcce66b27261553c308779f3e8663a269ed3a671 /svx/source/form
parent	8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)