summaryrefslogtreecommitdiff
path: root/connectivity/source/commontools
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/commontools')
-rw-r--r--connectivity/source/commontools/BlobHelper.cxx10
-rw-r--r--connectivity/source/commontools/ConnectionWrapper.cxx12
-rw-r--r--connectivity/source/commontools/DateConversion.cxx4
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx110
-rw-r--r--connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx42
-rw-r--r--connectivity/source/commontools/ParamterSubstitution.cxx18
-rw-r--r--connectivity/source/commontools/TColumnsHelper.cxx2
-rw-r--r--connectivity/source/commontools/TConnection.cxx2
-rw-r--r--connectivity/source/commontools/TDatabaseMetaDataBase.cxx60
-rw-r--r--connectivity/source/commontools/TIndexColumns.cxx2
-rw-r--r--connectivity/source/commontools/TIndexes.cxx2
-rw-r--r--connectivity/source/commontools/TKeyColumns.cxx2
-rw-r--r--connectivity/source/commontools/TKeys.cxx2
-rw-r--r--connectivity/source/commontools/TPrivilegesResultSet.cxx2
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx14
-rw-r--r--connectivity/source/commontools/conncleanup.cxx10
-rw-r--r--connectivity/source/commontools/dbexception.cxx17
-rw-r--r--connectivity/source/commontools/dbtools.cxx16
-rw-r--r--connectivity/source/commontools/parameters.cxx2
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx19
20 files changed, 171 insertions, 177 deletions
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index 396e3567490f..05e047b9ec72 100644
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -29,19 +29,19 @@ BlobHelper::BlobHelper(const css::uno::Sequence< sal_Int8 >& _val) : m_aValue(_v
{
}
-::sal_Int64 SAL_CALL BlobHelper::length( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::length( )
{
return m_aValue.getLength();
}
-css::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length )
{
if ( sal_Int32(pos + _length) > m_aValue.getLength() )
throw css::sdbc::SQLException();
return css::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length);
}
-css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( )
{
return new ::comphelper::SequenceInputStream(m_aValue);
}
@@ -53,13 +53,13 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStrea
SAL_WNOUNREACHABLE_CODE_PUSH
-::sal_Int64 SAL_CALL BlobHelper::position( const css::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::position( const css::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ )
{
::dbtools::throwFeatureNotImplementedSQLException( "XBlob::position", *this );
return 0;
}
-::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ )
{
::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this );
return 0;
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index f28c0e8ab538..2e8be47952bf 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -105,13 +105,13 @@ OConnectionWrapper::~OConnectionWrapper()
// XServiceInfo
-OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (css::uno::RuntimeException, std::exception)
+OUString SAL_CALL OConnectionWrapper::getImplementationName( )
{
return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
}
-css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( )
{
// first collect the services which are supported by our aggregate
Sequence< OUString > aSupported;
@@ -132,19 +132,19 @@ css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceN
}
-sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
-Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType )
{
Any aReturn = OConnection_BASE::queryInterface(_rType);
return aReturn.hasValue() ? aReturn : (m_xProxyConnection.is() ? m_xProxyConnection->queryAggregation(_rType) : aReturn);
}
-Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (css::uno::RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( )
{
return ::comphelper::concatSequences(
OConnection_BASE::getTypes(),
@@ -153,7 +153,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (css::uno::Runt
}
// css::lang::XUnoTunnel
-sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
+sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId )
{
if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
return reinterpret_cast< sal_Int64 >( this );
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 1986adc5e08e..209332ebeb38 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -234,7 +234,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
const OUString& rString,
sal_Int32 nKey,
sal_Int16 nFieldType,
- sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException)
+ sal_Int16 nKeyType)
{
if (!rString.isEmpty())
{
@@ -332,7 +332,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
const Date& rNullDate,
const double& rValue,
- sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException)
+ sal_Int16 nKeyType)
{
switch (nKeyType & ~NumberFormat::DEFINED)
{
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index f3192a1e4e4e..d8e847711f8d 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -141,13 +141,13 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
ODatabaseMetaDataResultSet_BASE::release();
}
-Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType )
{
Any aRet = OPropertySetHelper::queryInterface(rType);
return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
}
-Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception)
+Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( )
{
::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
cppu::UnoType<css::beans::XFastPropertySet>::get(),
@@ -163,7 +163,7 @@ void ODatabaseMetaDataResultSet::setRows(const ORows& _rRows)
m_bEOF = m_aRows.empty();
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName )
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -187,78 +187,78 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum
#endif
}
-void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException)
+void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex )
{
if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
::dbtools::throwInvalidIndexException(*this);
}
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ )
{
return nullptr;
}
-Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ )
{
return nullptr;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex )
{
return bool(getValue(columnIndex));
}
-sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( )
{
return 0;
}
-sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( )
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -270,60 +270,60 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData
return m_xMetaData;
}
-Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ )
{
return nullptr;
}
-Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ )
{
return nullptr;
}
-Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ )
{
return nullptr;
}
-Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ )
{
return nullptr;
}
-Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ )
{
return getValue(columnIndex).makeAny();
}
-sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex )
{
return getValue(columnIndex);
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( )
{
return m_bEOF;
}
@@ -331,13 +331,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException
SAL_WNOUNREACHABLE_CODE_PUSH
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
@@ -346,18 +346,18 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run
SAL_WNOUNREACHABLE_CODE_POP
-void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( )
{
::dbtools::throwFunctionSequenceException(*this);
}
-void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::afterLast( )
{
::dbtools::throwFunctionSequenceException(*this);
}
-void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::close( )
{
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -370,32 +370,32 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE
SAL_WNOUNREACHABLE_CODE_PUSH
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
@@ -404,7 +404,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R
SAL_WNOUNREACHABLE_CODE_POP
-Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( )
{
return m_aStatement.get();
}
@@ -412,19 +412,19 @@ Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) th
SAL_WNOUNREACHABLE_CODE_PUSH
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( )
{
::dbtools::throwFunctionSequenceException(*this);
return false;
@@ -433,13 +433,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException,
SAL_WNOUNREACHABLE_CODE_POP
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( )
{
return m_bBOF;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( )
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -468,7 +468,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( )
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -480,20 +480,20 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru
return (*m_aRowsIter)[m_nColPos]->getValue().isNull();
}
-void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( )
{
}
-void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::cancel( )
{
}
-void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( )
{
}
-Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( )
{
return Any();
}
@@ -638,7 +638,7 @@ void ODatabaseMetaDataResultSet::setImportedKeysMap()
m_xMetaData = pMetaData;
}
-Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( )
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
@@ -747,7 +747,7 @@ ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getQuoteValue()
return aValueRef;
}
-void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments )
{
if ( _aArguments.getLength() == 2 )
{
@@ -845,28 +845,28 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
// XServiceInfo
- OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) throw(RuntimeException)
+ OUString ODatabaseMetaDataResultSet::getImplementationName_Static( )
{
return OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
}
- Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw (RuntimeException)
+ Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( )
{
Sequence<OUString> aSNS { "com.sun.star.sdbc.ResultSet" };
return aSNS;
}
- OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( ) throw(RuntimeException, std::exception)
+ OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( )
{
return getImplementationName_Static();
}
- sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
- Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( ) throw(RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( )
{
return getSupportedServiceNames_Static();
}
@@ -874,7 +874,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
namespace connectivity
{
/// @throws Exception
- Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& ) throw( Exception )
+ Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& )
{
return *(new ODatabaseMetaDataResultSet());
}
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 99479ca760f0..bfa88bd36c8d 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -34,7 +34,7 @@ ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData()
{
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnDisplaySize();
@@ -42,99 +42,99 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal
return 0;
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnType();
return 1;
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( )
{
return m_mColumns.size();
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.isCaseSensitive();
return true;
}
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ )
{
return OUString();
}
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnName();
return OUString();
}
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getTableName();
return OUString();
}
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ )
{
return OUString();
}
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnTypeName();
return OUString();
}
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnLabel();
return getColumnName(column);
}
-OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getColumnServiceName();
return OUString();
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.isCurrency();
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.isAutoIncrement();
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.isSigned();
return false;
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getPrecision();
return 0;
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getScale();
@@ -142,7 +142,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum
return 0;
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.isNullable();
@@ -150,24 +150,24 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col
return sal_Int32(false);
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column )
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.isSearchable();
return true;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ )
{
return true;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ )
{
return false;
}
-sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column )
{
return isDefinitelyWritable(column);
}
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 59d24110c09b..c44b8f34b808 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -31,7 +31,7 @@ namespace connectivity
ParameterSubstitution::ParameterSubstitution(const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)
{
}
- void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
+ void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments )
{
::osl::MutexGuard aGuard(m_aMutex);
comphelper::SequenceAsHashMap aArgs(_aArguments);
@@ -40,27 +40,27 @@ namespace connectivity
m_xConnection = xConnection;
}
- OUString ParameterSubstitution::getImplementationName_Static( ) throw(RuntimeException)
+ OUString ParameterSubstitution::getImplementationName_Static( )
{
return OUString("org.openoffice.comp.helper.ParameterSubstitution");
}
- OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException, std::exception)
+ OUString SAL_CALL ParameterSubstitution::getImplementationName( )
{
return getImplementationName_Static();
}
- sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+ sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
- Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) throw(RuntimeException, std::exception)
+ Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( )
{
return getSupportedServiceNames_Static();
}
- Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) throw (RuntimeException)
+ Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static( )
{
Sequence<OUString> aSNS { "com.sun.star.sdb.ParameterSubstitution" };
return aSNS;
@@ -72,7 +72,7 @@ namespace connectivity
return *(new ParameterSubstitution(_xContext));
}
- OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
+ OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ )
{
OUString sRet = _sText;
uno::Reference< sdbc::XConnection > xConnection = m_xConnection;
@@ -99,12 +99,12 @@ namespace connectivity
return sRet;
}
- OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (css::uno::RuntimeException, std::exception)
+ OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText )
{
return _sText;
}
- OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
+ OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ )
{
throw container::NoSuchElementException();
}
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 6cf821be8110..1b13ea4a2d62 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -151,7 +151,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
}
-void OColumnsHelper::impl_refresh() throw(RuntimeException)
+void OColumnsHelper::impl_refresh()
{
if ( m_pTable )
{
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index 7e34c98116d0..6853a69fac63 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -56,7 +56,7 @@ void OMetaConnection::disposing()
m_aStatements.clear();
}
//XUnoTunnel
-sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId )
{
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 4d8b74d7a583..d8d426b1182d 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -68,20 +68,20 @@ ODatabaseMetaDataBase::~ODatabaseMetaDataBase()
}
-Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo( ) throw (RuntimeException, std::exception)
+Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo( )
{
return m_aConnectionInfo;
}
-void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) throw(RuntimeException, std::exception)
+void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ )
{
// cut off all references to the connection
m_xConnection.clear();
m_xListenerHelper.clear();
}
-Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_aTypeInfoRows.empty() )
@@ -169,33 +169,33 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getExportedKeys(
- const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+ const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getImportedKeys(
- const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+ const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getPrimaryKeys(
- const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+ const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getIndexInfo(
const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
- sal_Bool /*unique*/, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception)
+ sal_Bool /*unique*/, sal_Bool /*approximate*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier(
const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, sal_Int32 /*scope*/,
- sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException, std::exception)
+ sal_Bool /*nullable*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
}
@@ -203,120 +203,120 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier(
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCrossReference(
const Any& /*primaryCatalog*/, const OUString& /*primarySchema*/,
const OUString& /*primaryTable*/, const Any& /*foreignCatalog*/,
- const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException, std::exception)
+ const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
}
-Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection( ) throw(SQLException, RuntimeException, std::exception)
+Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection( )
{
return m_xConnection;
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedureColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/,
- const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
+ const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedures(
const Any& /*catalog*/, const OUString& /*schemaPattern*/,
- const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
+ const OUString& /*procedureNamePattern*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getVersionColumns(
- const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception)
+ const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns );
}
-Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas( ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas( )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getColumnPrivileges(
const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
- const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
+ const OUString& /*columnNamePattern*/ )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
}
Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTablePrivileges(
- const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException, std::exception)
+ const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/)
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
}
-Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( ) throw(SQLException, RuntimeException, std::exception)
+Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( )
{
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
}
-OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( )
{
return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( )
{
return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
}
-OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) throw(SQLException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( )
{
return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( )
{
return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( )
{
return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( )
{
return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( )
{
return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( )
{
return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( )
{
return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( )
{
return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
}
-sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( )
{
return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
}
-sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( )
{
return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
}
-sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( )
{
return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
}
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 4aa37e197144..3d19c026ec1d 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -110,7 +110,7 @@ Reference< XPropertySet > OIndexColumns::createDescriptor()
return new OIndexColumn(true);
}
-void OIndexColumns::impl_refresh() throw(RuntimeException)
+void OIndexColumns::impl_refresh()
{
m_pIndex->refreshColumns();
}
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 81858e3c433b..66a7ccb6078d 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -110,7 +110,7 @@ sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName)
return xRet;
}
-void OIndexesHelper::impl_refresh() throw(RuntimeException)
+void OIndexesHelper::impl_refresh()
{
m_pTable->refreshIndexes();
}
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 6a71ff72088f..423529da466a 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -126,7 +126,7 @@ Reference< XPropertySet > OKeyColumnsHelper::createDescriptor()
return new OKeyColumn(isCaseSensitive());
}
-void OKeyColumnsHelper::impl_refresh() throw(css::uno::RuntimeException)
+void OKeyColumnsHelper::impl_refresh()
{
m_pKey->refreshColumns();
}
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 03ddf7e2ca66..e9834d080387 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -68,7 +68,7 @@ sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
return xRet;
}
-void OKeysHelper::impl_refresh() throw(RuntimeException)
+void OKeysHelper::impl_refresh()
{
m_pTable->refreshKeys();
}
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 96d1732f8c04..2d5e142d8eb2 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -114,7 +114,7 @@ m_xTables.clear();
m_xRow.clear();
}
-sal_Bool SAL_CALL OResultSetPrivileges::next( ) throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSetPrivileges::next( )
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index f6a45d4bacc1..7d20c75e7573 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -66,17 +66,17 @@ public:
// noncopyable
OTableContainerListener(const OTableContainerListener&) = delete;
const OTableContainerListener& operator=(const OTableContainerListener&) = delete;
- virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& /*Event*/ ) override
{
}
- virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override
{
OUString sName;
Event.Accessor >>= sName;
if ( m_aRefNames.find(sName) != m_aRefNames.end() )
m_pComponent->refreshKeys();
}
- virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override
{
OUString sOldComposedName,sNewComposedName;
Event.ReplacedElement >>= sOldComposedName;
@@ -85,7 +85,7 @@ public:
m_pComponent->refreshKeys();
}
// XEventListener
- virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) override
{
}
void clear() { m_pComponent = nullptr; }
@@ -492,7 +492,7 @@ OUString OTableHelper::getRenameStart() const
}
// XRename
-void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL OTableHelper::rename( const OUString& newName )
{
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(
@@ -542,7 +542,7 @@ Reference< XDatabaseMetaData> OTableHelper::getMetaData() const
return m_pImpl->m_xMetaData;
}
-void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor )
{
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(
@@ -560,7 +560,7 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference
}
-OUString SAL_CALL OTableHelper::getName() throw(RuntimeException, std::exception)
+OUString SAL_CALL OTableHelper::getName()
{
OUString sComposedName;
sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,false,::dbtools::EComposeRule::InDataManipulation);
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 5db4fbe0d518..03133dcf23e5 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -124,7 +124,7 @@ namespace dbtools
}
- void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent )
{
if ( _rEvent.PropertyName == ACTIVE_CONNECTION_PROPERTY_NAME )
{ // somebody set a new ActiveConnection
@@ -176,7 +176,7 @@ namespace dbtools
}
- void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource )
{
// the rowset is being disposed, and nobody has set a new ActiveConnection in the meantime
if ( isRowSetListening() )
@@ -204,15 +204,15 @@ namespace dbtools
}
}
- void SAL_CALL OAutoConnectionDisposer::cursorMoved( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::cursorMoved( const css::lang::EventObject& /*event*/ )
{
}
- void SAL_CALL OAutoConnectionDisposer::rowChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::rowChanged( const css::lang::EventObject& /*event*/ )
{
}
- void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const css::lang::EventObject& /*event*/ )
{
stopRowSetListening();
clearConnection();
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 133c543510cc..046b7537fe6e 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -344,7 +344,7 @@ void SQLExceptionIteratorHelper::next( SQLExceptionInfo& _out_rInfo )
}
-void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next) throw ( css::sdbc::SQLException )
+void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next)
{
::connectivity::SharedResources aResources;
throw SQLException(
@@ -357,7 +357,7 @@ void throwFunctionSequenceException(const Reference< XInterface >& Context, cons
}
void throwInvalidIndexException(const css::uno::Reference< css::uno::XInterface >& Context,
- const css::uno::Any& Next) throw ( css::sdbc::SQLException )
+ const css::uno::Any& Next)
{
::connectivity::SharedResources aResources;
throw SQLException(
@@ -370,7 +370,7 @@ void throwInvalidIndexException(const css::uno::Reference< css::uno::XInterface
}
void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName,
- const css::uno::Reference<css::uno::XInterface>& _rxContext) throw (css::sdbc::SQLException)
+ const css::uno::Reference<css::uno::XInterface>& _rxContext)
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -387,7 +387,7 @@ void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName,
}
void throwFunctionNotSupportedRuntimeException(const OUString& _rFunctionName,
- const css::uno::Reference<css::uno::XInterface>& _rxContext) throw (css::uno::RuntimeException)
+ const css::uno::Reference<css::uno::XInterface>& _rxContext)
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -401,20 +401,17 @@ void throwFunctionNotSupportedRuntimeException(const OUString& _rFunctionName,
}
void throwGenericSQLException(const OUString& _rMsg, const css::uno::Reference< css::uno::XInterface >& _rxSource)
- throw (css::sdbc::SQLException)
{
throwGenericSQLException(_rMsg, _rxSource, Any());
}
void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException)
- throw (SQLException)
{
throw SQLException( _rMsg, _rxSource, getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 0, _rNextException);
}
void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, const Reference< XInterface >& _rxContext )
- throw (SQLException)
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -432,7 +429,6 @@ void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, cons
}
void throwFeatureNotImplementedRuntimeException(const OUString& _rFeatureName, const Reference< XInterface >& _rxContext)
- throw (RuntimeException)
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceStringWithSubstitution(
@@ -444,7 +440,6 @@ void throwFeatureNotImplementedRuntimeException(const OUString& _rFeatureName, c
}
void throwInvalidColumnException( const OUString& _rColumnName, const Reference< XInterface >& _rxContext)
- throw (SQLException)
{
::connectivity::SharedResources aResources;
OUString sErrorMessage( aResources.getResourceStringWithSubstitution(
@@ -454,7 +449,7 @@ void throwInvalidColumnException( const OUString& _rColumnName, const Reference<
}
void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
- const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException)
+ const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException )
{
throw SQLException(
_rMessage,
@@ -467,7 +462,7 @@ void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState,
void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState,
- const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode ) throw (SQLException)
+ const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode )
{
throwSQLException( _rMessage, getStandardSQLState( _eSQLState ), _rxContext, _nErrorCode );
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 0f4b0ad8a02e..94c9eaf3ecb6 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -329,7 +329,7 @@ Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceN
return xReturn;
}
-Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) throw (RuntimeException)
+Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet)
{
Reference< XConnection> xReturn;
Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
@@ -1635,24 +1635,24 @@ namespace
OParameterWrapper(const ::std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){}
private:
// css::container::XElementAccess
- virtual Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override
+ virtual Type SAL_CALL getElementType() override
{
return m_xSource->getElementType();
}
- virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL hasElements( ) override
{
if ( m_aSet.empty() )
return m_xSource->hasElements();
return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
}
// css::container::XIndexAccess
- virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL getCount( ) override
{
if ( m_aSet.empty() )
return m_xSource->getCount();
return ::std::count(m_aSet.begin(),m_aSet.end(),false);
}
- virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override
+ virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override
{
if ( m_aSet.empty() )
return m_xSource->getByIndex(Index);
@@ -1775,7 +1775,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
sal_Int32 parameterIndex,
const Any& x,
sal_Int32 sqlType,
- sal_Int32 scale) throw(SQLException, RuntimeException, std::exception)
+ sal_Int32 scale)
{
ORowSetValue aVal;
aVal.fill(x);
@@ -1786,7 +1786,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
sal_Int32 parameterIndex,
const ::connectivity::ORowSetValue& _rValue,
sal_Int32 sqlType,
- sal_Int32 scale) throw(SQLException, RuntimeException, std::exception)
+ sal_Int32 scale)
{
if ( _rValue.isNull() )
_xParams->setNull(parameterIndex,sqlType);
@@ -2000,7 +2000,7 @@ void release(oslInterlockedCount& _refCount,
osl_atomic_increment( &_refCount );
}
-void checkDisposed(bool _bThrow) throw ( DisposedException )
+void checkDisposed(bool _bThrow)
{
if (_bThrow)
throw DisposedException();
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 32c2cc0a520a..ad3bf0338f15 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -1096,7 +1096,7 @@ namespace dbtools
m_xInnerParamUpdate->clearParameters( );
}
- void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException, std::exception )
+ void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues )
{
m_aValues = _rValues;
}
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 72e91a977e76..1f2466ca3774 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -97,7 +97,6 @@ namespace param
IMPLEMENT_FORWARD_REFCOUNT( ParameterWrapper, UnoBase )
css::uno::Any ParameterWrapper::queryInterface(css::uno::Type const & aType)
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Any a(UnoBase::queryInterface(aType));
if (!a.hasValue()) {
@@ -112,7 +111,7 @@ namespace param
}
- Sequence< Type > SAL_CALL ParameterWrapper::getTypes( ) throw(RuntimeException, std::exception)
+ Sequence< Type > SAL_CALL ParameterWrapper::getTypes( )
{
Sequence< Type > aTypes( 5 );
aTypes[ 0 ] = cppu::UnoType<XWeak>::get();
@@ -143,7 +142,7 @@ namespace param
}
- Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo() throw( RuntimeException, std::exception )
+ Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo()
{
return createPropertySetInfo( getInfoHelper() );
}
@@ -177,7 +176,7 @@ namespace param
}
- sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw( IllegalArgumentException )
+ sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
{
OSL_ENSURE( PROPERTY_ID_VALUE == nHandle, "ParameterWrapper::convertFastPropertyValue: the only non-readonly prop should be our PROPERTY_VALUE!" );
(void)nHandle;
@@ -189,7 +188,7 @@ namespace param
}
- void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception )
+ void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue )
{
if ( nHandle == PROPERTY_ID_VALUE )
{
@@ -283,7 +282,7 @@ namespace param
}
- Type SAL_CALL ParameterWrapperContainer::getElementType() throw( RuntimeException, std::exception )
+ Type SAL_CALL ParameterWrapperContainer::getElementType()
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
@@ -291,7 +290,7 @@ namespace param
}
- sal_Bool SAL_CALL ParameterWrapperContainer::hasElements() throw( RuntimeException, std::exception )
+ sal_Bool SAL_CALL ParameterWrapperContainer::hasElements()
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
@@ -299,7 +298,7 @@ namespace param
}
- sal_Int32 SAL_CALL ParameterWrapperContainer::getCount() throw( RuntimeException, std::exception )
+ sal_Int32 SAL_CALL ParameterWrapperContainer::getCount()
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
@@ -307,7 +306,7 @@ namespace param
}
- Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
+ Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
@@ -319,7 +318,7 @@ namespace param
}
- Reference< XEnumeration > ParameterWrapperContainer::createEnumeration() throw( RuntimeException, std::exception )
+ Reference< XEnumeration > ParameterWrapperContainer::createEnumeration()
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();