svx: remove SAL_THROW macro

Change-Id: I8bfce109e55871d48b35300be98085f383fef26f

17 files changed, 94 insertions, 96 deletions

diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 3fd93f5a919f..a4baf7d0d576 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -697,7 +697,7 @@ void SAL_CALL AccessibleControlShape::disposing (void)
     AccessibleShape::disposing();
 }
 
-bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
+bool AccessibleControlShape::ensureControlModelAccess()
 {
     if ( m_xControlModel.is() )
         return true;
@@ -755,7 +755,7 @@ void AccessibleControlShape::stopStateMultiplexing()
     }
 }
 
-OUString AccessibleControlShape::getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(())
+OUString AccessibleControlShape::getControlModelStringProperty( const OUString& _rPropertyName ) const
 {
     OUString sReturn;
     try
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index ad3ac459dcf8..e205ba74aada 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -105,19 +105,19 @@ namespace accessibility
         virtual ~AccessibleTextHelper_Impl();
 
         // XAccessibleContext child handling methods
-        sal_Int32 SAL_CALL getAccessibleChildCount() SAL_THROW((uno::RuntimeException));
-        uno::Reference< XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException));
+        sal_Int32 SAL_CALL getAccessibleChildCount();
+        uno::Reference< XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i );
 
         // XAccessibleEventBroadcaster child related methods
-        void SAL_CALL addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException));
-        void SAL_CALL removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException));
+        void SAL_CALL addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener );
+        void SAL_CALL removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener );
 
         // XAccessibleComponent child related methods
-        uno::Reference< XAccessible > SAL_CALL getAccessibleAtPoint( const awt::Point& aPoint ) SAL_THROW((uno::RuntimeException));
+        uno::Reference< XAccessible > SAL_CALL getAccessibleAtPoint( const awt::Point& aPoint );
 
-        SvxEditSourceAdapter& GetEditSource() const SAL_THROW((uno::RuntimeException));
+        SvxEditSourceAdapter& GetEditSource() const;
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException));
+        void SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource );
         SAL_WNODEPRECATED_DECLARATIONS_POP
 
         void SetEventSource( const uno::Reference< XAccessible >& rInterface )
@@ -155,11 +155,11 @@ namespace accessibility
         void FireEvent( const sal_Int16 nEventId, const uno::Any& rNewValue = uno::Any(), const uno::Any& rOldValue = uno::Any() ) const;
         void FireEvent( const AccessibleEventObject& rEvent ) const;
 
-        void SetFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-        bool HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException));
-        void SetChildFocus( sal_Int32 nChild, bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-        void SetShapeFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException));
-        void ChangeChildFocus( sal_Int32 nNewChild ) SAL_THROW((::com::sun::star::uno::RuntimeException));
+        void SetFocus( bool bHaveFocus );
+        bool HaveFocus();
+        void SetChildFocus( sal_Int32 nChild, bool bHaveFocus );
+        void SetShapeFocus( bool bHaveFocus );
+        void ChangeChildFocus( sal_Int32 nNewChild );
 
 #ifdef DBG_UTIL
         void CheckInvariants() const;
@@ -185,7 +185,7 @@ namespace accessibility
         void LostPropertyEvent( const uno::Any& rOldValue, const sal_Int16 nEventId ) const { FireEvent( nEventId, uno::Any(), rOldValue ); }
 
         // shutdown usage of current edit source on myself and the children.
-        void ShutdownEditSource() SAL_THROW((uno::RuntimeException));
+        void ShutdownEditSource();
 
         void ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32 nLast );
 
@@ -194,14 +194,14 @@ namespace accessibility
         int getNotifierClientId() const { return mnNotifierClientId; }
 
         // lock solar mutex before
-        SvxTextForwarder& GetTextForwarder() const SAL_THROW((uno::RuntimeException));
+        SvxTextForwarder& GetTextForwarder() const;
         // lock solar mutex before
-        SvxViewForwarder& GetViewForwarder() const SAL_THROW((uno::RuntimeException));
+        SvxViewForwarder& GetViewForwarder() const;
         // lock solar mutex before
-        SvxEditViewForwarder& GetEditViewForwarder( bool bCreate = false ) const SAL_THROW((uno::RuntimeException));
+        SvxEditViewForwarder& GetEditViewForwarder( bool bCreate = false ) const;
 
         // are we in edit mode?
-        bool IsActive() const SAL_THROW((uno::RuntimeException));
+        bool IsActive() const;
 
         // our frontend class (the one implementing the actual
         // interface). That's not necessarily the one containing the impl
@@ -293,7 +293,7 @@ namespace accessibility
         catch( const uno::Exception& ) {}
     }
 
-    SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const SAL_THROW((uno::RuntimeException))
+    SvxTextForwarder& AccessibleTextHelper_Impl::GetTextForwarder() const
     {
 
         if( !maEditSource.IsValid() )
@@ -310,7 +310,7 @@ namespace accessibility
             throw uno::RuntimeException("Text forwarder is invalid, model might be dead", mxFrontEnd);
     }
 
-    SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const SAL_THROW((uno::RuntimeException))
+    SvxViewForwarder& AccessibleTextHelper_Impl::GetViewForwarder() const
     {
 
         if( !maEditSource.IsValid() )
@@ -327,7 +327,7 @@ namespace accessibility
             throw uno::RuntimeException("View forwarder is invalid, model might be dead", mxFrontEnd);
     }
 
-    SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( bool bCreate ) const SAL_THROW((uno::RuntimeException))
+    SvxEditViewForwarder& AccessibleTextHelper_Impl::GetEditViewForwarder( bool bCreate ) const
     {
 
         if( !maEditSource.IsValid() )
@@ -354,7 +354,7 @@ namespace accessibility
         }
     }
 
-    SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const SAL_THROW((uno::RuntimeException))
+    SvxEditSourceAdapter& AccessibleTextHelper_Impl::GetEditSource() const
     {
 
         if( maEditSource.IsValid() )
@@ -414,7 +414,7 @@ namespace accessibility
         maParaManager.SetAdditionalChildStates( rChildStates );
     }
 
-    void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+    void AccessibleTextHelper_Impl::SetChildFocus( sal_Int32 nChild, bool bHaveFocus )
     {
 
         if( bHaveFocus )
@@ -440,7 +440,7 @@ namespace accessibility
         }
     }
 
-    void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+    void AccessibleTextHelper_Impl::ChangeChildFocus( sal_Int32 nNewChild )
     {
 
         if( mbThisHasFocus )
@@ -452,7 +452,7 @@ namespace accessibility
         OSL_TRACE("AccessibleTextHelper_Impl::ChangeChildFocus(): Paragraph %d received focus", nNewChild );
     }
 
-    void AccessibleTextHelper_Impl::SetShapeFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+    void AccessibleTextHelper_Impl::SetShapeFocus( bool bHaveFocus )
     {
 
         bool bOldFocus( mbThisHasFocus );
@@ -498,7 +498,7 @@ namespace accessibility
         }
     }
 
-    void AccessibleTextHelper_Impl::SetFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+    void AccessibleTextHelper_Impl::SetFocus( bool bHaveFocus )
     {
 
         bool bOldFocus( mbGroupHasFocus );
@@ -524,7 +524,7 @@ namespace accessibility
         OSL_TRACE("AccessibleTextHelper_Impl::SetFocus: focus changed, Object %p, state: %s", this, bHaveFocus ? "focused" : "not focused");
     }
 
-    bool AccessibleTextHelper_Impl::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
+    bool AccessibleTextHelper_Impl::HaveFocus()
     {
 
         // No locking of solar mutex here, since we rely on the fact
@@ -532,7 +532,7 @@ namespace accessibility
         return mbThisHasFocus;
     }
 
-    bool AccessibleTextHelper_Impl::IsActive() const SAL_THROW((uno::RuntimeException))
+    bool AccessibleTextHelper_Impl::IsActive() const
     {
 
         try
@@ -748,7 +748,7 @@ namespace accessibility
         catch( const uno::RuntimeException& ) {}
     }
 
-    void AccessibleTextHelper_Impl::ShutdownEditSource() SAL_THROW((uno::RuntimeException))
+    void AccessibleTextHelper_Impl::ShutdownEditSource()
     {
 
         // This should only be called with solar mutex locked, i.e. from the main office thread
@@ -777,7 +777,7 @@ namespace accessibility
     }
 
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    void AccessibleTextHelper_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
+    void AccessibleTextHelper_Impl::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource )
     {
 
         // This should only be called with solar mutex locked, i.e. from the main office thread
@@ -1613,13 +1613,13 @@ namespace accessibility
     }
 
     // XAccessibleContext
-    sal_Int32 SAL_CALL AccessibleTextHelper_Impl::getAccessibleChildCount() SAL_THROW((uno::RuntimeException))
+    sal_Int32 SAL_CALL AccessibleTextHelper_Impl::getAccessibleChildCount()
     {
 
         return mnLastVisibleChild - mnFirstVisibleChild + 1;
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
+    uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i )
     {
 
         i -= GetStartIndex();
@@ -1638,21 +1638,21 @@ namespace accessibility
             return NULL;
     }
 
-    void SAL_CALL AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
+    void SAL_CALL AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
 
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener );
     }
 
-    void SAL_CALL AccessibleTextHelper_Impl::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
+    void SAL_CALL AccessibleTextHelper_Impl::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
 
         if( getNotifierClientId() != -1 )
             ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
     }
 
-    uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleAtPoint( const awt::Point& _aPoint ) SAL_THROW((uno::RuntimeException))
+    uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleAtPoint( const awt::Point& _aPoint )
     {
 
         // make given position relative
@@ -1716,7 +1716,7 @@ namespace accessibility
     {
     }
 
-    const SvxEditSource& AccessibleTextHelper::GetEditSource() const SAL_THROW((uno::RuntimeException))
+    const SvxEditSource& AccessibleTextHelper::GetEditSource() const
     {
 #ifdef DBG_UTIL
         mpImpl->CheckInvariants();
@@ -1732,7 +1732,7 @@ namespace accessibility
     }
 
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
-    void AccessibleTextHelper::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource ) SAL_THROW((uno::RuntimeException))
+    void AccessibleTextHelper::SetEditSource( ::std::auto_ptr< SvxEditSource > pEditSource )
     {
 #ifdef DBG_UTIL
         // precondition: solar mutex locked
@@ -1777,7 +1777,7 @@ namespace accessibility
 #endif
     }
 
-    void AccessibleTextHelper::SetFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException))
+    void AccessibleTextHelper::SetFocus( bool bHaveFocus )
     {
 #ifdef DBG_UTIL
         // precondition: solar mutex locked
@@ -1793,7 +1793,7 @@ namespace accessibility
 #endif
     }
 
-    bool AccessibleTextHelper::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException))
+    bool AccessibleTextHelper::HaveFocus()
     {
 #ifdef DBG_UTIL
         mpImpl->CheckInvariants();
@@ -1901,7 +1901,7 @@ namespace accessibility
         mpImpl->SetAdditionalChildStates( rChildStates );
     }
 
-    void AccessibleTextHelper::UpdateChildren() SAL_THROW((::com::sun::star::uno::RuntimeException))
+    void AccessibleTextHelper::UpdateChildren()
     {
 #ifdef DBG_UTIL
         // precondition: solar mutex locked
@@ -1956,7 +1956,7 @@ namespace accessibility
     }
 
     // XAccessibleContext
-    sal_Int32 AccessibleTextHelper::GetChildCount() SAL_THROW((uno::RuntimeException))
+    sal_Int32 AccessibleTextHelper::GetChildCount()
     {
         SolarMutexGuard aGuard;
 
@@ -1973,7 +1973,7 @@ namespace accessibility
 #endif
     }
 
-    uno::Reference< XAccessible > AccessibleTextHelper::GetChild( sal_Int32 i ) SAL_THROW((lang::IndexOutOfBoundsException, uno::RuntimeException))
+    uno::Reference< XAccessible > AccessibleTextHelper::GetChild( sal_Int32 i )
     {
         SolarMutexGuard aGuard;
 
@@ -1990,7 +1990,7 @@ namespace accessibility
 #endif
     }
 
-    void AccessibleTextHelper::AddEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
+    void AccessibleTextHelper::AddEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
 #ifdef DBG_UTIL
         mpImpl->CheckInvariants();
@@ -2003,7 +2003,7 @@ namespace accessibility
 #endif
     }
 
-    void AccessibleTextHelper::RemoveEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) SAL_THROW((uno::RuntimeException))
+    void AccessibleTextHelper::RemoveEventListener( const uno::Reference< XAccessibleEventListener >& xListener )
     {
 #ifdef DBG_UTIL
         mpImpl->CheckInvariants();
@@ -2017,7 +2017,7 @@ namespace accessibility
     }
 
     // XAccessibleComponent
-    uno::Reference< XAccessible > AccessibleTextHelper::GetAt( const awt::Point& aPoint ) SAL_THROW((uno::RuntimeException))
+    uno::Reference< XAccessible > AccessibleTextHelper::GetAt( const awt::Point& aPoint )
     {
         SolarMutexGuard aGuard;
 
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index d4a694516f67..90e89774dd8e 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -198,7 +198,6 @@ namespace svxform
 
     Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const OUString& _rDataSourceName,
         const OUString& _rUser, const OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const
-            SAL_THROW ( (SQLException) )
     {
         Reference< XConnection > xReturn;
         if ( ensureLoaded() )
@@ -209,7 +208,6 @@ namespace svxform
 
     Reference< XConnection > OStaticDataAccessTools::connectRowset( const Reference< XRowSet >& _rxRowSet,
         const Reference< XComponentContext >& _rxContext, bool _bSetAsActiveConnection ) const
-        SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
     {
         Reference< XConnection > xReturn;
         if ( ensureLoaded() )
@@ -218,7 +216,7 @@ namespace svxform
     }
 
 
-    Reference< XConnection > OStaticDataAccessTools::getRowSetConnection(const Reference< XRowSet >& _rxRowSet) const SAL_THROW ( (RuntimeException) )
+    Reference< XConnection > OStaticDataAccessTools::getRowSetConnection(const Reference< XRowSet >& _rxRowSet) const
     {
         Reference< XConnection > xReturn;
         if ( ensureLoaded() )
@@ -282,7 +280,7 @@ namespace svxform
 
     Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
         const sal_Int32 _nCommandType, const OUString& _rCommand,
-            Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+            Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo )
     {
         Reference< XNameAccess > aFields;
         if ( ensureLoaded() )
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 790c7a2785da..32ce91cb6cd1 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -136,7 +136,7 @@ namespace svxform
     }
 
 
-    ControlStatus ControlBorderManager::getControlStatus( const Reference< XControl >& _rxControl ) SAL_THROW(())
+    ControlStatus ControlBorderManager::getControlStatus( const Reference< XControl >& _rxControl )
     {
         ControlStatus nStatus = CONTROL_STATUS_NONE;
 
@@ -172,7 +172,7 @@ namespace svxform
     }
 
 
-    void ControlBorderManager::updateBorderStyle( const Reference< XControl >& _rxControl, const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rFallback ) SAL_THROW(())
+    void ControlBorderManager::updateBorderStyle( const Reference< XControl >& _rxControl, const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rFallback )
     {
         OSL_PRECOND( _rxControl.is() && _rxPeer.is(), "ControlBorderManager::updateBorderStyle: invalid parameters!" );
 
@@ -215,7 +215,7 @@ namespace svxform
     }
 
 
-    void ControlBorderManager::controlStatusGained( const Reference< XInterface >& _rxControl, ControlData& _rControlData ) SAL_THROW(())
+    void ControlBorderManager::controlStatusGained( const Reference< XInterface >& _rxControl, ControlData& _rControlData )
     {
         if ( _rxControl == _rControlData.xControl )
             // nothing to do - though suspicious
@@ -248,7 +248,7 @@ namespace svxform
     }
 
 
-    void ControlBorderManager::controlStatusLost( const Reference< XInterface >& _rxControl, ControlData& _rControlData ) SAL_THROW(())
+    void ControlBorderManager::controlStatusLost( const Reference< XInterface >& _rxControl, ControlData& _rControlData )
     {
         if ( _rxControl != _rControlData.xControl )
             // nothing to do
@@ -330,35 +330,35 @@ namespace svxform
     }
 
 
-    void ControlBorderManager::focusGained( const Reference< XInterface >& _rxControl ) SAL_THROW(())
+    void ControlBorderManager::focusGained( const Reference< XInterface >& _rxControl )
     {
         if ( m_bDynamicBorderColors )
             controlStatusGained( _rxControl, m_aFocusControl );
     }
 
 
-    void ControlBorderManager::focusLost( const Reference< XInterface >& _rxControl ) SAL_THROW(())
+    void ControlBorderManager::focusLost( const Reference< XInterface >& _rxControl )
     {
         if ( m_bDynamicBorderColors )
             controlStatusLost( _rxControl, m_aFocusControl );
     }
 
 
-    void ControlBorderManager::mouseEntered( const Reference< XInterface >& _rxControl ) SAL_THROW(())
+    void ControlBorderManager::mouseEntered( const Reference< XInterface >& _rxControl )
     {
         if ( m_bDynamicBorderColors )
             controlStatusGained( _rxControl, m_aMouseHoverControl );
     }
 
 
-    void ControlBorderManager::mouseExited( const Reference< XInterface >& _rxControl ) SAL_THROW(())
+    void ControlBorderManager::mouseExited( const Reference< XInterface >& _rxControl )
     {
         if ( m_bDynamicBorderColors )
             controlStatusLost( _rxControl, m_aMouseHoverControl );
     }
 
 
-    void ControlBorderManager::validityChanged( const Reference< XControl >& _rxControl, const Reference< XValidatableFormComponent >& _rxValidatable ) SAL_THROW(())
+    void ControlBorderManager::validityChanged( const Reference< XControl >& _rxControl, const Reference< XValidatableFormComponent >& _rxValidatable )
     {
         try
         {
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 95e9c94a454d..7280b8178a48 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -91,7 +91,7 @@ namespace svxform
         }
 
 
-        static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName ) SAL_THROW(( Exception ))
+        static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName )
         {
             bool bSuccess = true;
             Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY );
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index ece8a92fbbfd..cc8440aeb50f 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -109,7 +109,7 @@ namespace svxform
     //= DocumentClassification
 
 
-    DocumentType DocumentClassification::classifyDocument( const Reference< XModel >& _rxDocumentModel ) SAL_THROW(())
+    DocumentType DocumentClassification::classifyDocument( const Reference< XModel >& _rxDocumentModel )
     {
         DocumentType eType( eUnknownDocumentType );
 
@@ -148,7 +148,7 @@ namespace svxform
     }
 
 
-    DocumentType DocumentClassification::classifyHostDocument( const Reference< XInterface >& _rxFormComponent ) SAL_THROW(())
+    DocumentType DocumentClassification::classifyHostDocument( const Reference< XInterface >& _rxFormComponent )
     {
         DocumentType eType( eUnknownDocumentType );
 
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index de8441e16b36..23f0ec5295cf 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -63,13 +63,13 @@ namespace svx
     }
 
 
-    void FmTextControlFeature::dispatch() const SAL_THROW(())
+    void FmTextControlFeature::dispatch() const
     {
         dispatch( Sequence< PropertyValue >( ) );
     }
 
 
-    void FmTextControlFeature::dispatch( const Sequence< PropertyValue >& _rArgs ) const SAL_THROW(())
+    void FmTextControlFeature::dispatch( const Sequence< PropertyValue >& _rArgs ) const
     {
         try
         {
@@ -99,7 +99,7 @@ namespace svx
     }
 
 
-    void FmTextControlFeature::dispose() SAL_THROW(())
+    void FmTextControlFeature::dispose()
     {
         try
         {
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index cc7ea753b31a..37529548cbc0 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -827,7 +827,7 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > &
 
 
 
-void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(())
+void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _rxContainer, bool _bStartListening )
 {
     OSL_PRECOND( _rxContainer.is(), "FmXUndoEnvironment::switchListening: invalid container!" );
     if ( !_rxContainer.is() )
@@ -884,7 +884,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
 }
 
 
-void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(())
+void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening )
 {
     OSL_PRECOND( _rxObject.is(), "FmXUndoEnvironment::switchListening: how should I listen at a NULL object?" );
 
@@ -1083,7 +1083,7 @@ void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xEle
 }
 
 
-void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
+void FmUndoContainerAction::implReInsert( )
 {
     if ( m_xContainer->getCount() >= m_nIndex )
     {
@@ -1112,7 +1112,7 @@ void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
 }
 
 
-void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
+void FmUndoContainerAction::implReRemove( )
 {
     Reference< XInterface > xElement;
     if ( ( m_nIndex >= 0 ) && ( m_nIndex < m_xContainer->getCount() ) )
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 0d4457cb9a31..f0d6f225762a 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1147,7 +1147,7 @@ void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeExce
 
 // OComponentHelper
 
-void FormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
+void FormController::disposeAllFeaturesAndDispatchers()
 {
     for ( DispatcherContainer::iterator aDispatcher = m_aFeatureDispatchers.begin();
           aDispatcher != m_aFeatureDispatchers.end();
@@ -3556,7 +3556,7 @@ Window* FormController::getDialogParentWindow()
     return pParentWindow;
 }
 
-bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(())
+bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel )
 {
     try
     {
@@ -3598,7 +3598,7 @@ bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstIn
 }
 
 
-Reference< XControl > FormController::locateControl( const Reference< XControlModel >& _rxModel ) SAL_THROW(())
+Reference< XControl > FormController::locateControl( const Reference< XControlModel >& _rxModel )
 {
     try
     {
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 8f108f394e38..aca6ad92ecbc 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -202,7 +202,7 @@ namespace svx
     }
 
 
-    void OSingleFeatureDispatcher::checkAlive() const SAL_THROW((DisposedException))
+    void OSingleFeatureDispatcher::checkAlive() const
     {
         if ( m_bDisposed )
             throw DisposedException( OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) );
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index 29c6e64a5803..5fb59251f91d 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -158,15 +158,15 @@ namespace svxform
         ~ControlBorderManager();
 
     public:
-        void    focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ) SAL_THROW(());
-        void    focusLost( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ) SAL_THROW(());
-        void    mouseEntered( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ) SAL_THROW(());
-        void    mouseExited( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ) SAL_THROW(());
+        void    focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl );
+        void    focusLost( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl );
+        void    mouseEntered( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl );
+        void    mouseExited( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl );
 
         void    validityChanged(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidatableFormComponent >& _rxValidatable
-                ) SAL_THROW(());
+                );
 
         /// enables dynamic border color for the controls
         void    enableDynamicBorderColor( );
@@ -195,7 +195,7 @@ namespace svxform
         void    controlStatusGained(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl,
                     ControlData& _rControlData
-                ) SAL_THROW(());
+                );
 
         /** called when a control lost one of the two possible statuses (focused, and hovered with the mouse)
             @param _rxControl
@@ -203,7 +203,7 @@ namespace svxform
             @param _rControlData
                 the control's status data, as a reference to our respective member
         */
-        void    controlStatusLost( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl, ControlData& _rControlData ) SAL_THROW(());
+        void    controlStatusLost( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl, ControlData& _rControlData );
 
         /** determines whether the border of a given peer can be colored
             @param _rxPeer
@@ -213,7 +213,7 @@ namespace svxform
 
         /** determines the status of the given control
         */
-        ControlStatus   getControlStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) SAL_THROW(());
+        ControlStatus   getControlStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
 
         /** retrieves the color associated with a given ControlStatus
             @param _eStatus
@@ -234,7 +234,7 @@ namespace svxform
                             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _rxPeer,
                             const BorderDescriptor& _rFallback
-                        ) SAL_THROW(());
+                        );
 
         /** determines the to-be-remembered original border color and type for a control
 
diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx
index 03ada7d4f133..5e9578728359 100644
--- a/svx/source/inc/fmdocumentclassification.hxx
+++ b/svx/source/inc/fmdocumentclassification.hxx
@@ -54,11 +54,11 @@ namespace svxform
         */
         static DocumentType classifyDocument(
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocumentModel
-                            ) SAL_THROW(());
+                            );
 
         static DocumentType classifyHostDocument(
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxFormComponent
-                            ) SAL_THROW(());
+                            );
 
         static  DocumentType getDocumentTypeForModuleIdentifier(
                                 const OUString& _rModuleIdentifier
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index da9ea54fe47d..ef9af8fd9413 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -69,14 +69,14 @@ namespace svx
 
         /** dispatches the feature URL to the dispatcher
         */
-        void    dispatch() const SAL_THROW(());
+        void    dispatch() const;
 
         /** dispatches the feature URL to the dispatcher, with passing the given arguments
         */
-        void    dispatch( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) const SAL_THROW(());
+        void    dispatch( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) const;
 
         /// releases any resources associated with this instance
-        void    dispose() SAL_THROW(());
+        void    dispose();
 
     protected:
         virtual ~FmTextControlFeature();
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index abaf346ab908..ad0eecb1fefd 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -104,8 +104,8 @@ public:
     static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElem );
 
 protected:
-    void    implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
-    void    implReRemove( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
+    void    implReInsert( );
+    void    implReRemove( );
 };
 
 
@@ -197,8 +197,8 @@ private:
 
     void    implSetModified();
 
-    void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(());
-    void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(());
+    void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& _rxContainer, bool _bStartListening );
+    void    switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening );
     ::com::sun::star::uno::Reference< com::sun::star::script::XScriptListener > m_vbaListener;
 public:
     // Methoden zur Zuordnung von Controls zu Forms,
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 0134eadc2243..f6e4e87d13c8 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -435,7 +435,7 @@ namespace svxform
 
         /** disposes all dispatchers in m_aFeatureDispatchers, and empties m_aFeatureDispatchers
         */
-        void    disposeAllFeaturesAndDispatchers() SAL_THROW(());
+        void    disposeAllFeaturesAndDispatchers();
 
         void startFiltering();
         void stopFiltering();
@@ -554,12 +554,12 @@ namespace svxform
         bool    checkFormComponentValidity(
                     OUString& /* [out] */ _rFirstInvalidityExplanation,
                     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel
-                ) SAL_THROW(());
+                );
 
         /** locates the control which belongs to a given model
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
-                locateControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ) SAL_THROW(());
+                locateControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel );
 
         // set the text for all filters
         void impl_setTextOnAllFilter_throw();
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index f2d138fb752f..51700a77b9ad 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -110,7 +110,7 @@ namespace svx
                 our Mutex is locked - else calling the method would not make sense, since
                 its result could be out-of-date as soon as it's returned to the caller.
         */
-        void    checkAlive() const SAL_THROW((::com::sun::star::lang::DisposedException));
+        void    checkAlive() const;
 
         /** retrieves the current status of our feature, in a format which can be used
             for UNO notifications
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index cafb6b542b33..bdc4478bea60 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -776,7 +776,7 @@ namespace
         lcl_mapAPIToFormValue( rValue, aMapAdjustToAlign );
     }
 
-    void convertVerticalAdjustToVerticalAlign( Any& _rValue ) SAL_THROW( ( lang::IllegalArgumentException ) )
+    void convertVerticalAdjustToVerticalAlign( Any& _rValue )
     {
         if ( !_rValue.hasValue() )
             return;