connectivity: remove SAL_THROW macro

Change-Id: Id3bbb7a0d39a41b7106303f42d55ba4968235b63

3 files changed, 13 insertions, 16 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() )