connectivity: remove SAL_THROW macro

Change-Id: Id3bbb7a0d39a41b7106303f42d55ba4968235b63

17 files changed, 61 insertions, 67 deletions

diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 9200694e056c..f0c74a549535 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -310,7 +310,6 @@ Reference< XConnection > getConnection_allowException(
 
 Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceName,
         const OUString& _rUser, const OUString& _rPwd, const Reference< XComponentContext>& _rxContext)
-    SAL_THROW ( (SQLException) )
 {
     Reference< XConnection > xReturn;
     try
@@ -343,7 +342,6 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro
 // not needed anymore, the whole implementation can be moved into ensureRowSetConnection then)
 SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext,
         bool _bSetAsActiveConnection, bool _bAttachAutoDisposer )
-    SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
 {
     SharedConnection xConnection;
 
@@ -458,14 +456,14 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
 }
 
 Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext,
-    bool _bSetAsActiveConnection )  SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
+    bool _bSetAsActiveConnection )
 {
     SharedConnection xConnection = lcl_connectRowSet( _rxRowSet, _rxContext, _bSetAsActiveConnection, true );
     return xConnection.getTyped();
 }
 
 SharedConnection ensureRowSetConnection(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext>& _rxContext,
-    bool _bUseAutoConnectionDisposer )  SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
+    bool _bUseAutoConnectionDisposer )
 {
     return lcl_connectRowSet( _rxRowSet, _rxContext, true, _bUseAutoConnectionDisposer );
 }
@@ -526,7 +524,7 @@ namespace
 
 Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
     const sal_Int32 _nCommandType, const OUString& _rCommand,
-    Reference< XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+    Reference< XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo )
 {
     OSL_PRECOND( _rxConnection.is(), "::dbtools::getFieldsByCommandDescriptor: invalid connection!" );
     OSL_PRECOND( ( CommandType::TABLE == _nCommandType ) || ( CommandType::QUERY == _nCommandType ) || ( CommandType::COMMAND == _nCommandType ),
@@ -721,7 +719,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
 
 Sequence< OUString > getFieldNamesByCommandDescriptor( const Reference< XConnection >& _rxConnection,
     const sal_Int32 _nCommandType, const OUString& _rCommand,
-    SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+    SQLExceptionInfo* _pErrorInfo )
 {
     // get the container for the fields
     Reference< XComponent > xKeepFieldsAlive;
@@ -1230,7 +1228,6 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
 }
 
 Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XComponentContext >& _rxContext )
-    SAL_THROW( ( SQLException ) )
 {
     Reference< XSingleSelectQueryComposer > xComposer;
     try
@@ -1448,7 +1445,7 @@ void showError(const SQLExceptionInfo& _rInfo,
 }
 
 bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
-    const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) )
+    const sal_Int32 _nColumnIndex, const Any& _rValue)
 {
     bool bSuccessfullyReRouted = true;
     switch (_rValue.getValueTypeClass())
@@ -1541,7 +1538,7 @@ bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
 }
 
 bool implSetObject( const Reference< XParameters >& _rxParameters,
-                        const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) )
+                        const sal_Int32 _nColumnIndex, const Any& _rValue)
 {
     bool bSuccessfullyReRouted = true;
     switch (_rValue.getValueTypeClass())
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ec5254cd9777..a5faf6fc6268 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -911,7 +911,7 @@ namespace
 }
 
 
-sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((com::sun::star::sdbc::SQLException))
+sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OString& _rDest, rtl_TextEncoding _eEncoding )
 {
     if ( !rtl_convertUStringToString( &_rDest.pData, _rSource.getStr(), _rSource.getLength(),
             _eEncoding,
@@ -940,7 +940,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr
 
 
 sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSource, OString&  _rDest,
-   sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding ) SAL_THROW((SQLException))
+   sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding )
 {
     sal_Int32 nLen = convertUnicodeString( _rSource, _rDest, _eEncoding );
     if ( nLen > _nMaxLen )
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index cc3799ed33dd..129ecb0add26 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -124,7 +124,7 @@ namespace dbtools
     }
 
 
-    void ParameterManager::setAllParametersNull() SAL_THROW( ( SQLException, RuntimeException ) )
+    void ParameterManager::setAllParametersNull()
     {
         OSL_PRECOND( isAlive(), "ParameterManager::setAllParametersNull: not initialized, or already disposed!" );
         if ( !isAlive() )
@@ -243,7 +243,7 @@ namespace dbtools
 
 
     void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns,
-        const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( Exception ))
+        const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents )
     {
         OSL_PRECOND( m_aMasterFields.getLength() == m_aDetailFields.getLength(),
             "ParameterManager::classifyLinks: master and detail fields should have the same length!" );
@@ -758,7 +758,7 @@ namespace dbtools
     }
 
 
-    void ParameterManager::cacheConnectionInfo() SAL_THROW(( ))
+    void ParameterManager::cacheConnectionInfo()
     {
         try
         {
@@ -780,7 +780,7 @@ namespace dbtools
     }
 
 
-    bool ParameterManager::getColumns( Reference< XNameAccess >& /* [out] */ _rxColumns, bool _bFromComposer ) SAL_THROW(( Exception ))
+    bool ParameterManager::getColumns( Reference< XNameAccess >& /* [out] */ _rxColumns, bool _bFromComposer )
     {
         _rxColumns.clear();
 
@@ -850,7 +850,7 @@ namespace dbtools
     }
 
 
-    void ParameterManager::resetParameterValues( ) SAL_THROW(())
+    void ParameterManager::resetParameterValues( )
     {
         OSL_PRECOND( isAlive(), "ParameterManager::resetParameterValues: not initialized, or already disposed!" );
         if ( !isAlive() )
diff --git a/connectivity/source/drivers/mork/MNSINIParser.hxx b/connectivity/source/drivers/mork/MNSINIParser.hxx
index 7f078a776e94..8cfbd2856f5c 100644
--- a/connectivity/source/drivers/mork/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mork/MNSINIParser.hxx
@@ -35,10 +35,10 @@ struct ini_NameValue
     OUString sName;
     OUString sValue;
 
-    inline ini_NameValue() SAL_THROW(())
+    inline ini_NameValue()
         {}
     inline ini_NameValue(
-        OUString const & name, OUString const & value ) SAL_THROW(())
+        OUString const & name, OUString const & value )
         : sName( name ),
           sValue( value )
         {}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 7f078a776e94..8cfbd2856f5c 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
@@ -35,10 +35,10 @@ struct ini_NameValue
     OUString sName;
     OUString sValue;
 
-    inline ini_NameValue() SAL_THROW(())
+    inline ini_NameValue()
         {}
     inline ini_NameValue(
-        OUString const & name, OUString const & value ) SAL_THROW(())
+        OUString const & name, OUString const & value )
         : sName( name ),
           sValue( value )
         {}
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx
index df0be6184f9b..9fb7fe05b11c 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -294,7 +294,7 @@ void OOneInstanceComponentFactory::disposing()
 //      OUString const & rImplementationName,
 //      ::com::sun::star::uno::Sequence< OUString > const & rServiceNames,
 //      rtl_ModuleCount * pModCount = 0 )
-//      SAL_THROW(())
+//
 //  {
 //      return new OOneInstanceComponentFactory( rImplementationName, fptr , rServiceNames);
 //  }
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index cefddcd0540e..74563555a51e 100644
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
@@ -115,13 +115,13 @@ namespace connectivity
                 m_ColumnLabel = _aColumnName;
         }
 
-        inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t nSize )
             { return ::rtl_allocateMemory( nSize ); }
-        inline static void * SAL_CALL operator new( size_t ,void* _pHint ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t ,void* _pHint )
             { return _pHint; }
-        inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void * pMem )
             { ::rtl_freeMemory( pMem ); }
-        inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void *,void* )
             {  }
 
         bool isAutoIncrement()              const { return m_AutoIncrement; }
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index ac19ad963c2e..8df9ed0d761e 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -63,13 +63,13 @@ namespace connectivity
                 ,bUnsigned(false)
         {}
 
-        inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t nSize )
             { return ::rtl_allocateMemory( nSize ); }
-        inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
             { return _pHint; }
-        inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void * pMem )
             { ::rtl_freeMemory( pMem ); }
-        inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
             {  }
 
         bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; }
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index 4fb32932f5a6..161d475fd731 100644
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
@@ -36,13 +36,13 @@ namespace connectivity
 
         ~OKeyValue();
 
-        inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t nSize )
             { return ::rtl_allocateMemory( nSize ); }
-        inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t,void* _pHint )
             { return _pHint; }
-        inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void * pMem )
             { ::rtl_freeMemory( pMem ); }
-        inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void *,void* )
             {  }
 
         static OKeyValue* createKeyValue(sal_Int32 nVal);
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 3c79fb5034c5..206a5b8f0926 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -41,13 +41,13 @@ namespace connectivity
         OSkipDeletedSet(IResultSetHelper* _pHelper);
         ~OSkipDeletedSet();
 
-        inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t nSize )
             { return ::rtl_allocateMemory( nSize ); }
-        inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t,void* _pHint )
             { return _pHint; }
-        inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void * pMem )
             { ::rtl_freeMemory( pMem ); }
-        inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void *,void* )
             {  }
 
         /**
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 6caf0272ef1b..6f2acdc01f90 100644
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
@@ -63,13 +63,13 @@ namespace connectivity
 
         ~OSortIndex();
 
-        inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t nSize )
             { return ::rtl_allocateMemory( nSize ); }
-        inline static void * SAL_CALL operator new( size_t,void* _pHint ) SAL_THROW(())
+        inline static void * SAL_CALL operator new( size_t,void* _pHint )
             { return _pHint; }
-        inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void * pMem )
             { ::rtl_freeMemory( pMem ); }
-        inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW(())
+        inline static void SAL_CALL operator delete( void *,void* )
             {  }
 
 
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index d34ff5fc9258..ea502f103711 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -46,13 +46,13 @@ namespace connectivity
         public:
             OSQLAnalyzer(OConnection* _pConnection);
             virtual ~OSQLAnalyzer();
-            inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+            inline static void * SAL_CALL operator new( size_t nSize )
                 { return ::rtl_allocateMemory( nSize ); }
-            inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(())
+            inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
                 { return _pHint; }
-            inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+            inline static void SAL_CALL operator delete( void * pMem )
                 { ::rtl_freeMemory( pMem ); }
-            inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(())
+            inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
                 {  }
 
             OConnection* getConnection() const { return m_pConnection; }
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 1c5c91220293..f8cb32afcf6e 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -49,13 +49,13 @@ namespace connectivity
             OCode();
             virtual ~OCode();
 
-            inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+            inline static void * SAL_CALL operator new( size_t nSize )
                 { return ::rtl_allocateMemory( nSize ); }
-            inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(())
+            inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
                 { return _pHint; }
-            inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+            inline static void SAL_CALL operator delete( void * pMem )
                 { ::rtl_freeMemory( pMem ); }
-            inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(())
+            inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
                 {  }
 
             TYPEINFO();
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 9ba2f276f2a5..7f09023ae4b6 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -49,13 +49,13 @@ namespace connectivity
 
             virtual ~OPredicateCompiler();
 
-            inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW(())
+            inline static void * SAL_CALL operator new( size_t nSize )
                 { return ::rtl_allocateMemory( nSize ); }
-            inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW(())
+            inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint )
                 { return _pHint; }
-            inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW(())
+            inline static void SAL_CALL operator delete( void * pMem )
                 { ::rtl_freeMemory( pMem ); }
-            inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW(())
+            inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ )
                 {  }
             void dispose();
 
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 55bfdf4628d0..ce63c340033f 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -84,14 +84,13 @@ namespace connectivity
 
 
     Reference< XConnection> ODataAccessStaticTools::getConnection_withFeedback(const OUString& _rDataSourceName, const OUString& _rUser,
-        const OUString& _rPwd, const Reference< XComponentContext>& _rxContext) const SAL_THROW ( (SQLException) )
+        const OUString& _rPwd, const Reference< XComponentContext>& _rxContext) const
     {
         return ::dbtools::getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxContext);
     }
 
 
     Reference< XConnection> ODataAccessStaticTools::connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection) const
-        SAL_THROW ( (SQLException, WrappedTargetException, RuntimeException) )
     {
         return ::dbtools::connectRowset( _rxRowSet, _rxContext, _bSetAsActiveConnection);
     }
@@ -99,7 +98,7 @@ namespace connectivity
 
     Reference< XConnection> ODataAccessStaticTools::getRowSetConnection(
                 const Reference< XRowSet>& _rxRowSet)
-                const SAL_THROW ( (RuntimeException) )
+                const
     {
         return ::dbtools::getConnection(_rxRowSet);
     }
@@ -175,7 +174,7 @@ namespace connectivity
 
     Reference< XNameAccess > ODataAccessStaticTools::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 )
     {
         return ::dbtools::getFieldsByCommandDescriptor( _rxConnection, _nCommandType, _rCommand,
             _rxKeepFieldsAlive, _pErrorInfo );
@@ -184,7 +183,7 @@ namespace connectivity
 
     Sequence< OUString > ODataAccessStaticTools::getFieldNamesByCommandDescriptor(
         const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType,
-        const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+        const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo )
     {
         return ::dbtools::getFieldNamesByCommandDescriptor( _rxConnection, _nCommandType,
             _rCommand, _pErrorInfo );
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index ad1fb96cd47e..949713117221 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -71,21 +71,19 @@ namespace connectivity
             const OUString& _rUser,
             const OUString& _rPwd,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
-        ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ) SAL_OVERRIDE;
+        ) const SAL_OVERRIDE;
 
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext,
             sal_Bool _bSetAsActiveConnection
-        ) const SAL_THROW ( ( ::com::sun::star::sdbc::SQLException
-                            , ::com::sun::star::lang::WrappedTargetException
-                            , ::com::sun::star::uno::RuntimeException ) ) SAL_OVERRIDE;
+        ) const SAL_OVERRIDE;
 
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet)
-                const SAL_THROW ( (::com::sun::star::uno::RuntimeException) ) SAL_OVERRIDE;
+                const SAL_OVERRIDE;
 
 
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats(
@@ -167,7 +165,7 @@ namespace connectivity
                 const OUString& _rCommand,
                 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
                 ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
-            )   SAL_THROW( ( ) ) SAL_OVERRIDE;
+            ) SAL_OVERRIDE;
 
 
         virtual ::com::sun::star::uno::Sequence< OUString >
@@ -176,7 +174,7 @@ namespace connectivity
                 const sal_Int32 _nCommandType,
                 const OUString& _rCommand,
                 ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
-            )   SAL_THROW( ( ) ) SAL_OVERRIDE;
+            ) SAL_OVERRIDE;
 
 
         virtual bool isEmbeddedInDatabase(
diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index 25cebc81f7d8..e029b4acc900 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -31,10 +31,10 @@ struct ini_NameValue
     OUString sName;
     OUString sValue;
 
-    inline ini_NameValue() SAL_THROW(())
+    inline ini_NameValue()
         {}
     inline ini_NameValue(
-        OUString const & name, OUString const & value ) SAL_THROW(())
+        OUString const & name, OUString const & value )
         : sName( name ),
           sValue( value )
         {}