extensions: remove SAL_THROW macro

Change-Id: I12b5b46d31d5189adb21804a818ce591f2c19cbf

28 files changed, 180 insertions, 183 deletions

diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index c9e71eaaea2c..839e6696d640 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -69,7 +69,7 @@ namespace abp
 
 
 
-    static Reference< XDatabaseContext > lcl_getDataSourceContext( const Reference< XComponentContext >& _rxContext ) SAL_THROW (( Exception ))
+    static Reference< XDatabaseContext > lcl_getDataSourceContext( const Reference< XComponentContext >& _rxContext )
     {
         Reference<XDatabaseContext> xContext = DatabaseContext::create(_rxContext);
         return xContext;
@@ -79,7 +79,7 @@ namespace abp
     /// creates a new data source and inserts it into the context
     static void lcl_implCreateAndInsert(
         const Reference< XComponentContext >& _rxContext, const OUString& _rName,
-        Reference< XPropertySet >& /* [out] */ _rxNewDataSource ) SAL_THROW (( ::com::sun::star::uno::Exception ))
+        Reference< XPropertySet >& /* [out] */ _rxNewDataSource )
     {
 
         // get the data source context
@@ -109,7 +109,7 @@ namespace abp
     /// creates and inserts a data source, and sets its URL property to the string given
     static ODataSource lcl_implCreateAndSetURL(
         const Reference< XComponentContext >& _rxORB, const OUString& _rName,
-        const sal_Char* _pInitialAsciiURL ) SAL_THROW (( ))
+        const sal_Char* _pInitialAsciiURL )
     {
         ODataSource aReturn( _rxORB );
         try
@@ -140,7 +140,7 @@ namespace abp
 
     void lcl_registerDataSource(
         const Reference< XComponentContext >& _rxORB, const OUString& _sName,
-        const OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception ))
+        const OUString& _sURL )
     {
         OSL_ENSURE( !_sName.isEmpty(), "lcl_registerDataSource: invalid name!" );
         OSL_ENSURE( !_sURL.isEmpty(), "lcl_registerDataSource: invalid URL!" );
@@ -225,71 +225,71 @@ namespace abp
     }
 
 
-    void ODataSourceContext::getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ))
+    void ODataSourceContext::getDataSourceNames( StringBag& _rNames ) const
     {
         _rNames = m_pImpl->aDataSourceNames;
     }
 
 
-    ODataSource ODataSourceContext::createNewLDAP( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewLDAP( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:ldap:" );
     }
 
 
-    ODataSource ODataSourceContext::createNewMORK( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewMORK( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" );
     }
 
 
-    ODataSource ODataSourceContext::createNewThunderbird( const OUString& _rName ) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewThunderbird( const OUString& _rName )
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:thunderbird" );
     }
 
 
-    ODataSource ODataSourceContext::createNewEvolutionLdap( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewEvolutionLdap( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
     }
 
-    ODataSource ODataSourceContext::createNewEvolutionGroupwise( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewEvolutionGroupwise( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
     }
 
-    ODataSource ODataSourceContext::createNewEvolution( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewEvolution( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
     }
 
 
-    ODataSource ODataSourceContext::createNewKab( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewKab( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:kab" );
     }
 
 
-    ODataSource ODataSourceContext::createNewMacab( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewMacab( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:macab" );
     }
 
 
-    ODataSource ODataSourceContext::createNewOutlook( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewOutlook( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlook" );
     }
 
 
-    ODataSource ODataSourceContext::createNewOE( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewOE( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlookexp" );
     }
 
 
-    ODataSource ODataSourceContext::createNewDBase( const OUString& _rName) SAL_THROW (( ))
+    ODataSource ODataSourceContext::createNewDBase( const OUString& _rName)
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" );
     }
@@ -362,7 +362,7 @@ namespace abp
     }
 
 
-    void ODataSource::store() SAL_THROW (( ))
+    void ODataSource::store()
     {
         if (!isValid())
             // nothing to do
@@ -383,7 +383,7 @@ namespace abp
         }
     }
 
-    void ODataSource::registerDataSource( const OUString& _sRegisteredDataSourceName) SAL_THROW (( ))
+    void ODataSource::registerDataSource( const OUString& _sRegisteredDataSourceName)
     {
         if (!isValid())
             // nothing to do
@@ -415,7 +415,7 @@ namespace abp
     }
 
 
-    void ODataSource::remove() SAL_THROW (( ))
+    void ODataSource::remove()
     {
         if (!isValid())
             // nothing to do
@@ -433,7 +433,7 @@ namespace abp
     }
 
 
-    bool ODataSource::rename( const OUString& _rName ) SAL_THROW (( ))
+    bool ODataSource::rename( const OUString& _rName )
     {
         if (!isValid())
             // nothing to do
@@ -444,7 +444,7 @@ namespace abp
     }
 
 
-    OUString ODataSource::getName() const SAL_THROW (( ))
+    OUString ODataSource::getName() const
     {
         if ( !isValid() )
             return OUString();
@@ -462,7 +462,7 @@ namespace abp
     }
 
 
-    const StringBag& ODataSource::getTableNames() const SAL_THROW (( ))
+    const StringBag& ODataSource::getTableNames() const
     {
         m_pImpl->aTables.clear();
         if ( !isConnected() )
@@ -502,7 +502,7 @@ namespace abp
     }
 
 
-    bool ODataSource::connect( Window* _pMessageParent ) SAL_THROW (( ))
+    bool ODataSource::connect( Window* _pMessageParent )
     {
         if ( isConnected( ) )
             // nothing to do
@@ -593,7 +593,7 @@ namespace abp
     }
 
 
-    void ODataSource::disconnect( ) SAL_THROW (( ))
+    void ODataSource::disconnect( )
     {
         m_pImpl->xConnection.clear();
         m_pImpl->aTables.clear();
@@ -601,18 +601,18 @@ namespace abp
     }
 
 
-    bool ODataSource::isConnected( ) const SAL_THROW (( ))
+    bool ODataSource::isConnected( ) const
     {
         return m_pImpl->xConnection.is();
     }
 
 
-    bool ODataSource::isValid() const SAL_THROW (( ))
+    bool ODataSource::isValid() const
     {
         return m_pImpl && m_pImpl->xDataSource.is();
     }
 
-    Reference< XPropertySet > ODataSource::getDataSource() const SAL_THROW (( ))
+    Reference< XPropertySet > ODataSource::getDataSource() const
     {
         return m_pImpl ? m_pImpl->xDataSource : Reference< XPropertySet >();
     }
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 1991d291b5d0..61b6855e31fa 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -58,43 +58,43 @@ namespace abp
         ~ODataSourceContext();
 
         /// retrieves the names of all data sources
-        void    getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ));
+        void    getDataSourceNames( StringBag& _rNames ) const;
 
         /// disambiguates the given name by appending auccessive numbers
         OUString& disambiguate(OUString& _rDataSourceName);
 
         /// creates a new MORK data source
-        ODataSource createNewMORK( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewMORK( const OUString& _rName );
 
         /// creates a new Thunderbird data source
-        ODataSource createNewThunderbird( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewThunderbird( const OUString& _rName );
 
         /// creates a new Evolution local data source
-        ODataSource createNewEvolution( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewEvolution( const OUString& _rName );
 
         /// creates a new Evolution LDAP data source
-        ODataSource createNewEvolutionLdap( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewEvolutionLdap( const OUString& _rName );
 
         /// creates a new Evolution GROUPWISE data source
-        ODataSource createNewEvolutionGroupwise( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewEvolutionGroupwise( const OUString& _rName );
 
         /// creates a new KDE address book data source
-        ODataSource createNewKab( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewKab( const OUString& _rName );
 
         /// creates a new Mac OS X address book data source
-        ODataSource createNewMacab( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewMacab( const OUString& _rName );
 
         /// creates a new LDAP data source
-        ODataSource createNewLDAP( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewLDAP( const OUString& _rName );
 
         /// creates a new Outlook data source
-        ODataSource createNewOutlook( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewOutlook( const OUString& _rName );
 
         /// creates a new Outlook express data source
-        ODataSource createNewOE( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewOE( const OUString& _rName );
 
         /// creates a new dBase data source
-        ODataSource createNewDBase( const OUString& _rName ) SAL_THROW (( ));
+        ODataSource createNewDBase( const OUString& _rName );
     };
 
 
@@ -133,19 +133,19 @@ namespace abp
 
 
         /// checks whether or not the object represents a valid data source
-        bool    isValid() const SAL_THROW (( ));
+        bool    isValid() const;
 
 
         /// removes the data source represented by the object from the data source context
-        void        remove() SAL_THROW (( ));
+        void        remove();
             // TODO: put this into the context class
 
         /// returns the name of the data source
         OUString
-                    getName() const SAL_THROW (( ));
+                    getName() const;
 
         /// renames the data source
-        bool    rename( const OUString& _rName ) SAL_THROW (( ));
+        bool    rename( const OUString& _rName );
             // TODO: put this into the context class
 
 
@@ -157,32 +157,32 @@ namespace abp
                 at all.
             @see isConnected
         */
-        bool    connect( Window* _pMessageParent ) SAL_THROW (( ));
+        bool    connect( Window* _pMessageParent );
 
         /// returns <TRUE/> if the object has a valid connection, obtained from it's data source
-        bool    isConnected( ) const SAL_THROW (( ));
+        bool    isConnected( ) const;
 
         /// disconnects from the data source (i.e. disposes the UNO connection hold internally)
-        void        disconnect( ) SAL_THROW (( ));
+        void        disconnect( );
 
         /// stores the database file
-        void        store() SAL_THROW (( ));
+        void        store();
 
         /// register the data source under the given name in the configuration
-        void        registerDataSource( const OUString& _sRegisteredDataSourceName )  SAL_THROW (( ));
+        void        registerDataSource( const OUString& _sRegisteredDataSourceName );
 
 
         /** retrieves the tables names from the connection
             <p>to be called when <method>isConnection</method> returns <TRUE/> only</p>
         */
-        const StringBag&    getTableNames() const SAL_THROW (( ));
+        const StringBag&    getTableNames() const;
 
         /** determines whether a given table exists
         */
         bool    hasTable( const OUString& _rTableName ) const;
 
         /// return the intern data source object
-        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const SAL_THROW (( ));
+        ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const;
 
 
 
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 1f72151daf05..8717ea75413b 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -70,7 +70,7 @@ namespace abp
 
 
         bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent,
-            const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) SAL_THROW ( ( ) )
+            const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings )
         {
             _rSettings.aFieldMapping.clear();
 
@@ -125,7 +125,7 @@ namespace abp
         }
 
 
-        void defaultMapping(  const Reference< XComponentContext >& _rxContext, MapString2String& _rFieldAssignment ) SAL_THROW ( ( ) )
+        void defaultMapping(  const Reference< XComponentContext >& _rxContext, MapString2String& _rFieldAssignment )
         {
             _rFieldAssignment.clear();
 
@@ -218,7 +218,7 @@ namespace abp
         }
 
 
-        void writeTemplateAddressFieldMapping( const Reference< XComponentContext >& _rxContext, const MapString2String& _rFieldAssignment ) SAL_THROW ( ( ) )
+        void writeTemplateAddressFieldMapping( const Reference< XComponentContext >& _rxContext, const MapString2String& _rFieldAssignment )
         {
             // want to have a non-const map for easier handling
             MapString2String aFieldAssignment( _rFieldAssignment );
@@ -298,7 +298,7 @@ namespace abp
 
 
         void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext,
-            const OUString& _rDataSourceName, const OUString& _rTableName ) SAL_THROW ( ( ) )
+            const OUString& _rDataSourceName, const OUString& _rTableName )
         {
             // access the configuration information which the driver uses for determining it's column names
             const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
@@ -316,7 +316,7 @@ namespace abp
         }
 
 
-        void markPilotSuccess( const Reference< XComponentContext >& _rxContext ) SAL_THROW ( ( ) )
+        void markPilotSuccess( const Reference< XComponentContext >& _rxContext )
         {
             // access the configuration information which the driver uses for determining it's column names
             const OUString& sAddressBookNodeName = lcl_getAddressBookNodeName();
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index 2fca1952dd1d..df5e71ae5052 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -64,7 +64,7 @@ namespace abp
             class Window* _pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource,
             AddressSettings& _rSettings
-        ) SAL_THROW ( ( ) );
+        );
 
 
         /** creates a default field mapping for usage with the address book SDBC driver
@@ -74,7 +74,7 @@ namespace abp
         void defaultMapping(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             MapString2String& /* [out] */ _rFieldAssignment
-        ) SAL_THROW ( ( ) );
+        );
 
 
         /** writes a field mapping for the template document address source
@@ -82,7 +82,7 @@ namespace abp
         void writeTemplateAddressFieldMapping(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const MapString2String& _rFieldAssignment
-        ) SAL_THROW ( ( ) );
+        );
 
 
     }   // namespace fieldmapping
@@ -101,13 +101,13 @@ namespace abp
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const OUString& _rDataSourceName,
             const OUString& _rTableName
-        ) SAL_THROW ( ( ) );
+        );
 
         /** writes the configuration entry which states the pilot has been completed successfully
         */
         void markPilotSuccess(
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext
-        ) SAL_THROW ( ( ) );
+        );
 
 
     }   // namespace addressconfig
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index e3bf34a93eee..e3a98dad88a1 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -162,7 +162,7 @@ namespace pcr
 
 
     bool CellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue,
-        const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(())
+        const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const
     {
         bool bSuccess = false;
 
diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx
index 9ea91f4756cc..a1f4d91b7397 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -270,7 +270,7 @@ namespace pcr
                             const OUString& _rOutputProperty,
                                   ::com::sun::star::uno::Any& _rOutputValue,
                             bool _bIsRange
-                        ) const SAL_THROW(());
+                        ) const;
     };
 
 
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 17d3cfdcb729..86d39c2743ed 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -102,7 +102,7 @@ namespace pcr
     }
 
 
-    bool EFormsHelper::canBindToDataType( sal_Int32 _nDataType ) const SAL_THROW(())
+    bool EFormsHelper::canBindToDataType( sal_Int32 _nDataType ) const
     {
         if ( !m_xBindableControl.is() )
             // cannot bind at all
@@ -196,7 +196,7 @@ namespace pcr
     }
 
 
-    bool EFormsHelper::isListEntrySink() const SAL_THROW(())
+    bool EFormsHelper::isListEntrySink() const
     {
         bool bIs = false;
         try
@@ -298,7 +298,7 @@ namespace pcr
     }
 
 
-    void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(())
+    void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const
     {
         if ( m_xDocument.is() )
         {
@@ -325,7 +325,7 @@ namespace pcr
     }
 
 
-    void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(())
+    void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const
     {
         _rBindingNames.resize( 0 );
         try
@@ -350,7 +350,7 @@ namespace pcr
     }
 
 
-    Reference< xforms::XModel > EFormsHelper::getFormModelByName( const OUString& _rModelName ) const SAL_THROW(())
+    Reference< xforms::XModel > EFormsHelper::getFormModelByName( const OUString& _rModelName ) const
     {
         Reference< xforms::XModel > xReturn;
         try
@@ -368,7 +368,7 @@ namespace pcr
     }
 
 
-    Reference< xforms::XModel > EFormsHelper::getCurrentFormModel() const SAL_THROW(())
+    Reference< xforms::XModel > EFormsHelper::getCurrentFormModel() const
     {
         Reference< xforms::XModel > xModel;
         try
@@ -387,7 +387,7 @@ namespace pcr
     }
 
 
-    OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(())
+    OUString EFormsHelper::getCurrentFormModelName() const
     {
         OUString sModelName;
         try
@@ -404,7 +404,7 @@ namespace pcr
     }
 
 
-    Reference< XPropertySet > EFormsHelper::getCurrentBinding() const SAL_THROW(())
+    Reference< XPropertySet > EFormsHelper::getCurrentBinding() const
     {
         Reference< XPropertySet > xBinding;
 
@@ -422,7 +422,7 @@ namespace pcr
     }
 
 
-    OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(())
+    OUString EFormsHelper::getCurrentBindingName() const
     {
         OUString sBindingName;
         try
@@ -439,7 +439,7 @@ namespace pcr
     }
 
 
-    Reference< XListEntrySource > EFormsHelper::getCurrentListSourceBinding() const SAL_THROW(())
+    Reference< XListEntrySource > EFormsHelper::getCurrentListSourceBinding() const
     {
         Reference< XListEntrySource > xReturn;
         try
@@ -457,7 +457,7 @@ namespace pcr
     }
 
 
-    void EFormsHelper::setListSourceBinding( const Reference< XListEntrySource >& _rxListSource ) SAL_THROW(())
+    void EFormsHelper::setListSourceBinding( const Reference< XListEntrySource >& _rxListSource )
     {
         try
         {
@@ -473,7 +473,7 @@ namespace pcr
     }
 
 
-    void EFormsHelper::setBinding( const Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding ) SAL_THROW(())
+    void EFormsHelper::setBinding( const Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding )
     {
         if ( !m_xBindableControl.is() )
             return;
@@ -499,14 +499,14 @@ namespace pcr
     }
 
 
-    Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(())
+    Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const
     {
         OSL_ENSURE( !_rBindingName.isEmpty(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" );
         return implGetOrCreateBinding( _rTargetModel, _rBindingName );
     }
 
 
-    Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(())
+    Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const
     {
         OSL_ENSURE( !( _rTargetModel.isEmpty() && !_rBindingName.isEmpty() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" );
 
@@ -609,7 +609,7 @@ namespace pcr
     }
 
 
-    OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(())
+    OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const
     {
         OUString sUIName;
         try
@@ -635,7 +635,7 @@ namespace pcr
     }
 
 
-    Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const OUString& _rUIName ) const SAL_THROW(())
+    Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const OUString& _rUIName ) const
     {
         const MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames );
         MapStringToPropertySet::const_iterator pos = rMapUINameToElement.find( _rUIName );
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index 32d1d89b62e4..9a4942142332 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -78,7 +78,7 @@ namespace pcr
         static  bool
                 isEForm(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument
-                ) SAL_THROW(());
+                );
 
         /** registers a listener to be notified when any aspect of the binding changes.
 
@@ -105,63 +105,63 @@ namespace pcr
                 the data type which should be bound. If this is -1, <TRUE/> is returned if the control model
                 can be bound to <em>any</em> data type.
         */
-        bool    canBindToDataType( sal_Int32 _nDataType = -1 ) const SAL_THROW(());
+        bool    canBindToDataType( sal_Int32 _nDataType = -1 ) const;
 
         /** checks whether the control model can be bound to any XSD data type
         */
-        bool    canBindToAnyDataType() const SAL_THROW(()) { return canBindToDataType( -1 ); }
+        bool    canBindToAnyDataType() const { return canBindToDataType( -1 ); }
 
         /** checks whether the control model is a source for list entries, as supplied by XML data bindings
         */
-        bool    isListEntrySink() const SAL_THROW(());
+        bool    isListEntrySink() const;
 
         /** retrieves the names of all XForms models in the document the control lives in
         */
-        void    getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(());
+        void    getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const;
 
         /** retrieves the names of all bindings for a given model
             @see getFormModelNames
         */
-        void    getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(());
+        void    getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const;
 
         /// retrieves the XForms model (within the control model's document) with the given name
         ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel >
-                getFormModelByName( const OUString& _rModelName ) const SAL_THROW(());
+                getFormModelByName( const OUString& _rModelName ) const;
 
         /** retrieves the model which the active binding of the control model belongs to
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel >
-                getCurrentFormModel() const SAL_THROW(());
+                getCurrentFormModel() const;
 
         /** retrieves the name of the model which the active binding of the control model belongs to
         */
         OUString
-                getCurrentFormModelName() const SAL_THROW(());
+                getCurrentFormModelName() const;
 
         /** retrieves the binding instance which is currently attached to the control model
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                getCurrentBinding() const SAL_THROW(());
+                getCurrentBinding() const;
 
         /** retrieves the name of the binding instance which is currently attached to the control model
         */
         OUString
-                getCurrentBindingName() const SAL_THROW(());
+                getCurrentBindingName() const;
 
         /** sets a new binding at the control model
         */
-        void    setBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding ) SAL_THROW(());
+        void    setBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding );
 
         /** retrieves the binding instance which is currently used as list source for the control model
             @see isListEntrySink
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >
-                getCurrentListSourceBinding() const SAL_THROW(());
+                getCurrentListSourceBinding() const;
 
         /** sets a new list source at the control model
             @see isListEntrySink
         */
-        void    setListSourceBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxListSource ) SAL_THROW(());
+        void    setListSourceBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxListSource );
 
         /** retrieves a given binding for a given model, or creates a new one
 
@@ -172,7 +172,7 @@ namespace pcr
                 have a binding with this name, a new binding is created and returned.
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-            getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(());
+            getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const;
 
         /** types of sub-elements of a model
         */
@@ -190,7 +190,7 @@ namespace pcr
                 getModelElementUIName(
                     const ModelElementType _eType,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxElement
-                ) const SAL_THROW(());
+                ) const;
 
         /** retrieves the submission object for an UI name
 
@@ -203,7 +203,7 @@ namespace pcr
                 getModelElementFromUIName(
                     const ModelElementType _eType,
                     const OUString& _rUIName
-                ) const SAL_THROW(());
+                ) const;
 
         /** retrieves the UI names of all elements of all models in our document
             @param _eType
@@ -240,7 +240,7 @@ namespace pcr
 
         /// implementation for both <member>getOrCreateBindingForModel</member>
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-            implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(());
+            implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const;
 
         void
             impl_toggleBindingPropertyListening_throw( bool _bDoListen, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& _rxConcreteListenerOrNull );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 460371e303b8..16b681d23e12 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -3246,7 +3246,7 @@ namespace pcr
     }
 
 
-    bool FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow( const Reference< XPropertySet >& _xFormProperties, bool _bAllowEmptyDataSourceName ) SAL_THROW(())
+    bool FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow( const Reference< XPropertySet >& _xFormProperties, bool _bAllowEmptyDataSourceName )
     {
         bool bHas = false;
         if ( _xFormProperties.is() )
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 4b63a9102475..85de9e3a0914 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -359,7 +359,7 @@ namespace pcr
     }
 
 
-    OUString FormLinkDialog::getFormDataSourceType( const Reference< XPropertySet >& _rxForm ) const SAL_THROW(())
+    OUString FormLinkDialog::getFormDataSourceType( const Reference< XPropertySet >& _rxForm ) const
     {
         OUString sReturn;
         if ( !_rxForm.is() )
@@ -386,7 +386,7 @@ namespace pcr
     }
 
 
-    void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(( ))
+    void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< OUString >& /* [out] */ _rNames ) const
     {
         _rNames.realloc( 0 );
 
@@ -438,7 +438,7 @@ namespace pcr
     }
 
 
-    void FormLinkDialog::ensureFormConnection( const Reference< XPropertySet >& _rxFormProps, Reference< XConnection >& /* [out] */ _rxConnection ) const SAL_THROW(( Exception ))
+    void FormLinkDialog::ensureFormConnection( const Reference< XPropertySet >& _rxFormProps, Reference< XConnection >& /* [out] */ _rxConnection ) const
     {
         OSL_PRECOND( _rxFormProps.is(), "FormLinkDialog::ensureFormConnection: invalid form!" );
         if ( !_rxFormProps.is() )
@@ -451,7 +451,7 @@ namespace pcr
     }
 
 
-    void FormLinkDialog::getConnectionMetaData( const Reference< XPropertySet >& _rxFormProps, Reference< XDatabaseMetaData >& /* [out] */ _rxMeta ) const SAL_THROW(( Exception ))
+    void FormLinkDialog::getConnectionMetaData( const Reference< XPropertySet >& _rxFormProps, Reference< XDatabaseMetaData >& /* [out] */ _rxMeta ) const
     {
         if ( _rxFormProps.is() )
         {
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index d5a0f9cf08cf..5b05249bca34 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -107,22 +107,22 @@ namespace pcr
 
         OUString    getFormDataSourceType(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm
-                    ) const SAL_THROW(());
+                    ) const;
 
         void        getFormFields(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm,
                             ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rNames
-                    ) const SAL_THROW(());
+                    ) const;
 
         void        ensureFormConnection(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps,
                             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& /* [out] */ _rxConnection
-                    ) const SAL_THROW(( ::com::sun::star::uno::Exception ));
+                    ) const;
 
         void        getConnectionMetaData(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps,
                             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& /* [out] */ _rxMeta
-                    ) const SAL_THROW(( ::com::sun::star::uno::Exception ));
+                    ) const;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                     getCanonicUnderlyingTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxFormProps ) const;
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index f0713b31f7c4..37d6dba734dc 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1130,7 +1130,7 @@ namespace pcr
     }
 
 
-    void OPropertyBrowserController::describePropertyLine( const Property& _rProperty, OLineDescriptor& _rDescriptor ) SAL_THROW((Exception))
+    void OPropertyBrowserController::describePropertyLine( const Property& _rProperty, OLineDescriptor& _rDescriptor )
     {
         try
         {
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 8b2fe2c4e9d4..265403bf8017 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -301,8 +301,7 @@ namespace pcr
         void updateViewDataFromActivePage();
 
         /// describes the UI for the given property
-        void describePropertyLine( const ::com::sun::star::beans::Property& _rPropertyName, OLineDescriptor& _rDescriptor )
-            SAL_THROW((::com::sun::star::uno::Exception));
+        void describePropertyLine( const ::com::sun::star::beans::Property& _rPropertyName, OLineDescriptor& _rDescriptor );
 
         /** retrieves the position of the property given by name in m_aProperties
             @return
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 2f1d3ce8e95d..2a2093710b0c 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -254,7 +254,7 @@ namespace pcr
         m_aSupportedProperties.realloc( 0 );
     }
 
-    void PropertyHandler::firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue ) SAL_THROW(())
+    void PropertyHandler::firePropertyChange( const OUString& _rPropName, PropertyId _nPropId, const Any& _rOldValue, const Any& _rNewValue )
     {
         PropertyChangeEvent aEvent;
         aEvent.Source = m_xComponent;
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 8e8ce9adeaaa..9cc754dd9454 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -134,7 +134,7 @@ namespace pcr
             @see addPropertyChangeListener
         */
         void    firePropertyChange( const OUString& _rPropName, PropertyId _nPropId,
-                    const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ) SAL_THROW(());
+                    const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue );
 
         /** retrieves a window which can be used as parent for dialogs
         */
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 69eff473e02f..2315c94ef87f 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -97,7 +97,7 @@ namespace pcr
     }
 
 
-    sal_Int32 PushButtonNavigation::implGetCurrentButtonType() const SAL_THROW((Exception))
+    sal_Int32 PushButtonNavigation::implGetCurrentButtonType() const
     {
         sal_Int32 nButtonType = FormButtonType_PUSH;
         if ( !m_xControlModel.is() )
@@ -120,7 +120,7 @@ namespace pcr
     }
 
 
-    Any PushButtonNavigation::getCurrentButtonType() const SAL_THROW(())
+    Any PushButtonNavigation::getCurrentButtonType() const
     {
         OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::getCurrentButtonType: not expected to be called for forms!" );
         Any aReturn;
@@ -137,7 +137,7 @@ namespace pcr
     }
 
 
-    void PushButtonNavigation::setCurrentButtonType( const Any& _rValue ) const SAL_THROW(())
+    void PushButtonNavigation::setCurrentButtonType( const Any& _rValue ) const
     {
         OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::setCurrentButtonType: not expected to be called for forms!" );
         if ( !m_xControlModel.is() )
@@ -168,7 +168,7 @@ namespace pcr
     }
 
 
-    PropertyState PushButtonNavigation::getCurrentButtonTypeState( ) const SAL_THROW(())
+    PropertyState PushButtonNavigation::getCurrentButtonTypeState( ) const
     {
         OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::getCurrentButtonTypeState: not expected to be called for forms!" );
         PropertyState eState = PropertyState_DIRECT_VALUE;
@@ -202,7 +202,7 @@ namespace pcr
     }
 
 
-    Any PushButtonNavigation::getCurrentTargetURL() const SAL_THROW(())
+    Any PushButtonNavigation::getCurrentTargetURL() const
     {
         Any aReturn;
         if ( !m_xControlModel.is() )
@@ -232,7 +232,7 @@ namespace pcr
     }
 
 
-    void PushButtonNavigation::setCurrentTargetURL( const Any& _rValue ) const SAL_THROW(())
+    void PushButtonNavigation::setCurrentTargetURL( const Any& _rValue ) const
     {
         if ( !m_xControlModel.is() )
             return;
@@ -248,7 +248,7 @@ namespace pcr
     }
 
 
-    PropertyState PushButtonNavigation::getCurrentTargetURLState( ) const SAL_THROW(())
+    PropertyState PushButtonNavigation::getCurrentTargetURLState( ) const
     {
         PropertyState eState = PropertyState_DIRECT_VALUE;
 
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx
index c6c206a4ec03..489d970837a3 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.hxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx
@@ -51,35 +51,35 @@ namespace pcr
             the "virtual" button types such as "move-to-next-record button".
         */
         ::com::sun::star::uno::Any
-                getCurrentButtonType() const SAL_THROW(());
+                getCurrentButtonType() const;
 
         /** sets the current value of the "ButtonType" property, taking into account
             the "virtual" button types such as "move-to-next-record button".
         */
-        void    setCurrentButtonType( const ::com::sun::star::uno::Any& _rValue ) const SAL_THROW(());
+        void    setCurrentButtonType( const ::com::sun::star::uno::Any& _rValue ) const;
 
         /** retrieves the current state of the "ButtonType" property, taking into account
             the "virtual" button types such as "move-to-next-record button".
         */
         ::com::sun::star::beans::PropertyState
-                getCurrentButtonTypeState( ) const SAL_THROW(());
+                getCurrentButtonTypeState( ) const;
 
         /** returns the current value of the "TargetURL" property, taking into account
             that some URLs are special values caused by "virtual" ButtonTypes
         */
         ::com::sun::star::uno::Any
-                getCurrentTargetURL() const SAL_THROW(());
+                getCurrentTargetURL() const;
 
         /** sets the current value of the "TargetURL" property, taking into account
             that some URLs are special values caused by "virtual" ButtonTypes
         */
-        void    setCurrentTargetURL( const ::com::sun::star::uno::Any& _rValue ) const SAL_THROW(());
+        void    setCurrentTargetURL( const ::com::sun::star::uno::Any& _rValue ) const;
 
         /** retrieves the current state of the "TargetURL" property, taking into account
             that some URLs are special values caused by "virtual" ButtonTypes
         */
         ::com::sun::star::beans::PropertyState
-                getCurrentTargetURLState( ) const SAL_THROW(());
+                getCurrentTargetURLState( ) const;
 
         /** determines whether the current button tpye is FormButtonType_URL
         */
@@ -90,7 +90,7 @@ namespace pcr
         bool    hasNonEmptyCurrentTargetURL() const;
 
     private:
-        sal_Int32 implGetCurrentButtonType() const SAL_THROW(( ::com::sun::star::uno::Exception ));
+        sal_Int32 implGetCurrentButtonType() const;
     };
 
 
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 25fe129fb214..c368a3a3d027 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -634,7 +634,6 @@ uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
 
 uno::Reference< uno::XInterface > SAL_CALL _create(
     const uno::Reference< uno::XComponentContext > & context)
-        SAL_THROW((uno::Exception))
 {
     return static_cast< ::cppu::OWeakObject * >(new pcr::StringRepresentation(context));
 }
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 4603b451d8b0..6696845a374c 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -68,7 +68,7 @@ namespace pcr
 
 
     bool SubmissionHelper::canTriggerSubmissions( const Reference< XPropertySet >& _rxControlModel,
-        const Reference< frame::XModel >& _rxContextDocument ) SAL_THROW(())
+        const Reference< frame::XModel >& _rxContextDocument )
     {
         if ( !EFormsHelper::isEForm( _rxContextDocument ) )
             return false;
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index 30f683a6d2e9..04563ced3772 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -56,7 +56,7 @@ namespace pcr
         static bool canTriggerSubmissions(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument
-                ) SAL_THROW(());
+                );
     };
 
 
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index b6274c32894d..2abf09f0d8fd 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -68,7 +68,7 @@ namespace pcr
     }
 
     template< typename FACETTYPE >
-    FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const OUString& _rFacetName ) SAL_THROW(())
+    FACETTYPE getFacet( const Reference< XPropertySet >& _rxFacets, const OUString& _rFacetName )
     {
         FACETTYPE aReturn;
         try
@@ -118,7 +118,7 @@ namespace pcr
     }
 
 
-    sal_Int16 XSDDataType::classify() const SAL_THROW(())
+    sal_Int16 XSDDataType::classify() const
     {
         sal_Int16 nTypeClass = DataTypeClass::STRING;
         try
@@ -134,19 +134,19 @@ namespace pcr
     }
 
 
-    bool XSDDataType::isBasicType() const SAL_THROW(())
+    bool XSDDataType::isBasicType() const
     {
         return getSave( m_xDataType.get(), &XDataType::getIsBasic );
     }
 
 
-    OUString XSDDataType::getName() const SAL_THROW(())
+    OUString XSDDataType::getName() const
     {
         return getSave( m_xDataType.get(), &XDataType::getName );
     }
 
 
-    void XSDDataType::setFacet( const OUString& _rFacetName, const Any& _rValue ) SAL_THROW(())
+    void XSDDataType::setFacet( const OUString& _rFacetName, const Any& _rValue )
     {
         try
         {
@@ -159,7 +159,7 @@ namespace pcr
     }
 
 
-    bool XSDDataType::hasFacet( const OUString& _rFacetName ) const SAL_THROW(())
+    bool XSDDataType::hasFacet( const OUString& _rFacetName ) const
     {
         bool bReturn = false;
         try
@@ -173,7 +173,7 @@ namespace pcr
         return bReturn;
     }
 
-    Any XSDDataType::getFacet( const OUString& _rFacetName ) SAL_THROW(())
+    Any XSDDataType::getFacet( const OUString& _rFacetName )
     {
         Any aReturn;
         try
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index 7f885b462b05..1cd2ee3d40a7 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -68,19 +68,19 @@ namespace pcr
                 getUnoDataType() const { return m_xDataType; }
 
         /// classifies the data typ
-        sal_Int16 classify() const SAL_THROW(());
+        sal_Int16 classify() const;
 
         // attribute access
-        OUString     getName() const SAL_THROW(());
-        bool                isBasicType() const SAL_THROW(());
+        OUString     getName() const;
+        bool                isBasicType() const;
 
         /// determines whether a given facet exists at the type
-        bool                hasFacet( const OUString& _rFacetName ) const SAL_THROW(());
+        bool                hasFacet( const OUString& _rFacetName ) const;
         /// retrieves a facet value
         ::com::sun::star::uno::Any
-                            getFacet( const OUString& _rFacetName ) SAL_THROW(());
+                            getFacet( const OUString& _rFacetName );
         /// sets a facet value
-        void                setFacet( const OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue ) SAL_THROW(());
+        void                setFacet( const OUString& _rFacetName, const ::com::sun::star::uno::Any& _rFacetValue );
 
        /** copies as much facets (values, respectively) from a give data type instance
        */
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index b5ffd5707a5c..196110f0fed9 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -74,7 +74,7 @@ namespace pcr
     }
 
 
-    void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(())
+    void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const
     {
         _rNames.resize( 0 );
 
@@ -95,7 +95,7 @@ namespace pcr
     }
 
 
-    Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository() const SAL_THROW((Exception))
+    Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository() const
     {
         Reference< XDataTypeRepository > xRepository;
 
@@ -107,7 +107,7 @@ namespace pcr
     }
 
 
-    Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((Exception))
+    Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const OUString& _rModelName ) const
     {
         Reference< XDataTypeRepository > xRepository;
 
@@ -119,7 +119,7 @@ namespace pcr
     }
 
 
-    Reference< XDataType > XSDValidationHelper::getDataType( const OUString& _rName ) const SAL_THROW((Exception))
+    Reference< XDataType > XSDValidationHelper::getDataType( const OUString& _rName ) const
     {
         Reference< XDataType > xDataType;
 
@@ -133,7 +133,7 @@ namespace pcr
     }
 
 
-    OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(())
+    OUString XSDValidationHelper::getValidatingDataTypeName( ) const
     {
         OUString sDataTypeName;
         try
@@ -153,7 +153,7 @@ namespace pcr
     }
 
 
-    ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const OUString& _rName ) const SAL_THROW(())
+    ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const OUString& _rName ) const
     {
         ::rtl::Reference< XSDDataType > pReturn;
 
@@ -176,13 +176,13 @@ namespace pcr
     }
 
 
-    ::rtl::Reference< XSDDataType > XSDValidationHelper::getValidatingDataType( ) const SAL_THROW(())
+    ::rtl::Reference< XSDDataType > XSDValidationHelper::getValidatingDataType( ) const
     {
         return getDataTypeByName( getValidatingDataTypeName() );
     }
 
 
-    bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(())
+    bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const
     {
         OSL_ENSURE( _pDataType.is(), "XSDValidationHelper::removeDataTypeFromRepository: invalid data type!" );
         if ( !_pDataType.is() )
@@ -210,7 +210,7 @@ namespace pcr
     }
 
 
-    bool XSDValidationHelper::removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(())
+    bool XSDValidationHelper::removeDataTypeFromRepository( const OUString& _rName ) const
     {
         try
         {
@@ -236,7 +236,7 @@ namespace pcr
     }
 
 
-    void XSDValidationHelper::setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(())
+    void XSDValidationHelper::setValidatingDataTypeByName( const OUString& _rName ) const
     {
         try
         {
@@ -275,7 +275,7 @@ namespace pcr
 
 
     void XSDValidationHelper::copyDataType( const OUString& _rFromModel, const OUString& _rToModel,
-                const OUString& _rDataTypeName ) const SAL_THROW(())
+                const OUString& _rDataTypeName ) const
     {
         if ( _rFromModel == _rToModel )
             // nothing to do (me thinks)
@@ -314,7 +314,7 @@ namespace pcr
     }
 
 
-    void XSDValidationHelper::findDefaultFormatForIntrospectee() SAL_THROW(())
+    void XSDValidationHelper::findDefaultFormatForIntrospectee()
     {
         try
         {
@@ -366,13 +366,13 @@ namespace pcr
     }
 
 
-    OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(())
+    OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const
     {
         return getBasicTypeNameForClass( _nClass, getDataTypeRepository() );
     }
 
 
-    OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(())
+    OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const
     {
         OUString sReturn;
         OSL_ENSURE( _rxRepository.is(), "XSDValidationHelper::getBasicTypeNameForClass: invalid repository!" );
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx
index accb75fdd95f..f6e977247e7d 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.hxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx
@@ -52,12 +52,12 @@ namespace pcr
 
         /** retrieves the names of all XForms models in the document the control lives in
         */
-        void    getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(());
+        void    getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const;
 
         /** retrieves a particular data type given by name
         */
         ::rtl::Reference< XSDDataType >
-                getDataTypeByName( const OUString& _rName ) const SAL_THROW(());
+                getDataTypeByName( const OUString& _rName ) const;
 
         /** retrieves the DataType instance which the control model is currently validated against
 
@@ -65,33 +65,33 @@ namespace pcr
             and if this validator is bound to an XDataType, then this data type is retrieved here.
         */
         ::rtl::Reference< XSDDataType >
-                getValidatingDataType( ) const SAL_THROW(());
+                getValidatingDataType( ) const;
 
         /** retrieves the name of the data type which the control model is currently validated against
 
             @seealso getValidatingDataType
         */
         OUString
-                getValidatingDataTypeName( ) const SAL_THROW(());
+                getValidatingDataTypeName( ) const;
 
         /** binds the validator to a new data type
 
             To be called with an active binding only.
         */
-        void    setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(());
+        void    setValidatingDataTypeByName( const OUString& _rName ) const;
 
         /** removes the data type given by name from the data type repository
         */
-        bool    removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(());
+        bool    removeDataTypeFromRepository( const OUString& _rName ) const;
 
         /** creates a new data type, which is a clone of an existing data type
         */
-        bool    cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(());
+        bool    cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const;
 
         /** retrieves the name of the basic data type which has the given class
         */
         OUString
-                getBasicTypeNameForClass( sal_Int16 _eClass ) const SAL_THROW(());
+                getBasicTypeNameForClass( sal_Int16 _eClass ) const;
 
         /** copy a data type from one model to another
 
@@ -99,29 +99,28 @@ namespace pcr
             happens. In particular, the facets of the data type are not copied.
         */
         void    copyDataType( const OUString& _rFromModel, const OUString& _rToModel,
-                    const OUString& _rDataTypeName ) const SAL_THROW(());
+                    const OUString& _rDataTypeName ) const;
 
         /** finds (and sets) a default format for the formatted field we're inspecting,
             according to the current data type the control value is evaluated against
         */
-        void findDefaultFormatForIntrospectee() SAL_THROW(());
+        void findDefaultFormatForIntrospectee();
 
     private:
         /** retrieves the data type repository associated with the current model
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository >
-                getDataTypeRepository() const SAL_THROW((::com::sun::star::uno::Exception));
+                getDataTypeRepository() const;
 
         /** retrieves the data type repository associated with any model
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository >
-                getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((::com::sun::star::uno::Exception));
+                getDataTypeRepository( const OUString& _rModelName ) const;
 
         /** retrieves the data type object for the given name
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType >
-            getDataType( const OUString& _rName ) const
-                SAL_THROW((::com::sun::star::uno::Exception));
+            getDataType( const OUString& _rName ) const;
 
         /** retrieves the name of the basic data type which has the given class, in the given repository
         */
@@ -129,7 +128,7 @@ namespace pcr
                 getBasicTypeNameForClass(
                     sal_Int16 _nClass,
                     ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XDataTypeRepository > _rxRepository
-                ) const SAL_THROW(());
+                ) const;
     };
 
 
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 2e7a62cfd9f6..ee3df95c0596 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -482,7 +482,7 @@ namespace pcr
     }
 
 
-    bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(())
+    bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( OUString& _rNewName )
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: this will crash!" );
 
@@ -505,7 +505,7 @@ namespace pcr
     }
 
 
-    bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(())
+    bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName )
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" );
 
@@ -521,7 +521,7 @@ namespace pcr
     }
 
 
-    bool XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType() SAL_THROW(())
+    bool XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType()
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: this will crash!" );
 
@@ -543,7 +543,7 @@ namespace pcr
     }
 
 
-    bool XSDValidationPropertyHandler::implDoRemoveCurrentDataType() SAL_THROW(())
+    bool XSDValidationPropertyHandler::implDoRemoveCurrentDataType()
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoRemoveCurrentDataType: this will crash!" );
 
@@ -653,7 +653,7 @@ namespace pcr
     }
 
 
-    void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(())
+    void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implGetAvailableDataTypeNames: this will crash!" );
         // start with *all* types which are available at the model
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index e8ce278e7a43..ff8bb26ea6c2 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -73,15 +73,15 @@ namespace pcr
         virtual void onNewComponent() SAL_OVERRIDE;
 
     private:
-        bool    implPrepareRemoveCurrentDataType() SAL_THROW(());
-        bool    implDoRemoveCurrentDataType() SAL_THROW(());
+        bool    implPrepareRemoveCurrentDataType();
+        bool    implDoRemoveCurrentDataType();
 
-        bool    implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(());
-        bool    implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(());
+        bool    implPrepareCloneDataCurrentType( OUString& _rNewName );
+        bool    implDoCloneCurrentDataType( const OUString& _rNewName );
 
         /** retrieves the names of the data types which our introspectee can be validated against
         */
-        void    implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(());
+        void    implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const;
     };
 
 
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 8bbdc02735cc..dca4aeea0ceb 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -1609,7 +1609,7 @@ UpdateCheck::autoCheckIntervalChanged()
 
 
 oslInterlockedCount SAL_CALL
-UpdateCheck::acquire() SAL_THROW(())
+UpdateCheck::acquire()
 {
     return ReferenceObject::acquire();
 }
@@ -1617,7 +1617,7 @@ UpdateCheck::acquire() SAL_THROW(())
 
 
 oslInterlockedCount SAL_CALL
-UpdateCheck::release() SAL_THROW(())
+UpdateCheck::release()
 {
     return ReferenceObject::release();
 }
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index 82e427512815..ddf617940eea 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -121,8 +121,8 @@ public:
     void closeAfterFailure() SAL_OVERRIDE;
 
     // rtl::IReference
-    virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(()) SAL_OVERRIDE;
-    virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()) SAL_OVERRIDE;
+    virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
+    virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
 
 private: