diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /connectivity/source/drivers/ado | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (diff) |
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.
Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly). The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually). There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).
Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code. Missing @throws
documentation has not been applied in such manual clean-up.
Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'connectivity/source/drivers/ado')
26 files changed, 473 insertions, 492 deletions
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 969494858938..1eee379f800e 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -45,107 +45,107 @@ OCallableStatement::OCallableStatement( OConnection* _pConnection, const OUStrin } -Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) { Any aRet = OPreparedStatement::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< XRow*>(this)); } -sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCallableStatement::wasNull( ) { return m_aValue.isNull(); } -sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getBool(); } -sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getInt8(); } -Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getByteSequence(); } -css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getDate(); } -double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getDouble(); } -float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getFloat(); } -sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getInt32(); } -sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) { GET_PARAM() return (sal_Int64)m_aValue.getCurrency().int64; } -Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getInt16(); } -OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getString(); } - css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) + css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getTime(); } - css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) + css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getDateTime(); } -void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); @@ -156,7 +156,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex } } -void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) { ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); @@ -169,40 +169,40 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet } -Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this ); return nullptr; } -Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this ); return nullptr; diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 310ec678a112..1683f0d9dcfb 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -92,7 +92,7 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -107,7 +107,7 @@ void OAdoColumn::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::cppu::UnoType<OUString>::get()); } -void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aColumn.IsValid()) { diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 352ca9989257..b1395122343e 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -46,7 +46,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) } -void OColumns::impl_refresh() throw(RuntimeException) +void OColumns::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 15432c3b4611..77daa121cac0 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star::sdbcx; IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.star.sdbc.Connection"); -OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) +OConnection::OConnection(ODriver* _pDriver) : OSubComponent<OConnection, OConnection_BASE>(static_cast<cppu::OWeakObject*>(_pDriver), this), m_xCatalog(nullptr), m_pDriver(_pDriver), @@ -158,7 +158,7 @@ void SAL_CALL OConnection::release() throw() release_ChildImpl(); } -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -169,7 +169,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return pStmt; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -181,7 +181,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xPStmt; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -193,7 +193,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin return xPStmt; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -214,7 +214,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLExcept return sql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -227,7 +227,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti m_pAdoConnection->RollbackTrans(); } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -236,7 +236,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return m_bAutocommit; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -245,7 +245,7 @@ void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) m_pAdoConnection->CommitTrans(); } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -254,14 +254,14 @@ void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) m_pAdoConnection->RollbackTrans(); } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed && !m_pAdoConnection->get_State(); } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -277,7 +277,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -287,7 +287,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, ADOS::ThrowException(*m_pAdoConnection,*this); } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -296,7 +296,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_pAdoConnection->get_Mode() == adModeRead; } -void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& catalog ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -305,7 +305,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept ADOS::ThrowException(*m_pAdoConnection,*this); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -313,7 +313,7 @@ OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeExcepti return m_pAdoConnection->GetDefaultDatabase(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -345,7 +345,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE ADOS::ThrowException(*m_pAdoConnection,*this); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -376,7 +376,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return nRet; } -Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -385,13 +385,13 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) th return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -402,16 +402,16 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OConnection::getWarnings( ) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::clearWarnings( ) { } -void OConnection::buildTypeInfo() throw( SQLException) +void OConnection::buildTypeInfo() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -495,7 +495,7 @@ void OConnection::disposing() dispose_ChildImpl(); } -sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException) +sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index ab1f6cd5cc61..f0a6165f8e8b 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) { } -sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); // ADOS::ThrowException(*m_pADOConnection,*this); @@ -59,7 +59,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw } -bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) +bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); @@ -68,7 +68,7 @@ bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css:: return !aVar.isNull() && !aVar.isEmpty() && aVar.getBool(); } -OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) +OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); @@ -92,7 +92,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) return xRef; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) { OLEVariant vtEmpty; vtEmpty.setNoArg(); @@ -115,7 +115,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) return getLiteral(DBLITERAL_CATALOG_SEPARATOR); } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) { OLEVariant vtEmpty; vtEmpty.setNoArg(); @@ -134,7 +134,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLExce Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const Any& catalog, const OUString& schema, const OUString& table, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const OUString& columnNamePattern ) { ADORecordset *pRecordset = m_pADOConnection->getColumnPrivileges(catalog,schema,table,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -149,7 +149,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const OUString& columnNamePattern ) { ADORecordset *pRecordset = m_pADOConnection->getColumns(catalog,schemaPattern,tableNamePattern,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -165,7 +165,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& catalog, const OUString& schemaPattern, - const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) + const OUString& tableNamePattern, const Sequence< OUString >& types ) { ADORecordset *pRecordset = m_pADOConnection->getTables(catalog,schemaPattern,tableNamePattern,types); ADOS::ThrowException(*m_pADOConnection,*this); @@ -181,7 +181,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) { ADORecordset *pRecordset = m_pADOConnection->getProcedureColumns(catalog,schemaPattern,procedureNamePattern,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -197,7 +197,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw(SQLException, RuntimeException) + const OUString& procedureNamePattern ) { // Create elements used in the array ADORecordset *pRecordset = m_pADOConnection->getProcedures(catalog,schemaPattern,procedureNamePattern); @@ -212,57 +212,57 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { return getMaxSize(DBLITERAL_BINARY_LITERAL); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { return getInt32Property("Maximum Row Size"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { return getMaxSize(DBLITERAL_CATALOG_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { return getMaxSize(DBLITERAL_CHAR_LITERAL); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { return getMaxSize(DBLITERAL_COLUMN_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { return getMaxSize(DBLITERAL_CURSOR_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { return getInt32Property("Active Sessions"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { return getInt32Property("Max Columns in Table"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { return getMaxSize(DBLITERAL_TEXT_COMMAND); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { return getMaxSize(DBLITERAL_TABLE_NAME); } @@ -273,7 +273,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) { ADORecordset *pRecordset = m_pADOConnection->getExportedKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -287,7 +287,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) { ADORecordset *pRecordset = m_pADOConnection->getImportedKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -302,7 +302,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) { ADORecordset *pRecordset = m_pADOConnection->getPrimaryKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -318,7 +318,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, - sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException) + sal_Bool unique, sal_Bool approximate ) { ADORecordset *pRecordset = m_pADOConnection->getIndexInfo(catalog,schema,table,unique,approximate); ADOS::ThrowException(*m_pADOConnection,*this); @@ -333,7 +333,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) { Reference< XResultSet > xRef; if(!ADOS::isJetEngine(m_pConnection->getEngineType())) @@ -388,7 +388,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, - const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException) + const OUString& foreignSchema, const OUString& foreignTable ) { ADORecordset *pRecordset = m_pADOConnection->getCrossReference(primaryCatalog,primarySchema,primaryTable,foreignCatalog,foreignSchema,foreignTable); ADOS::ThrowException(*m_pADOConnection,*this); @@ -402,17 +402,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( return xRef; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return getBoolProperty("Maximum Row Size Includes BLOB"); } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } @@ -422,17 +422,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } @@ -447,17 +447,17 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return true; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { return getInt32Property("Maximum Index Size"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NON_NULL; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { return getStringProperty("Catalog Term"); } @@ -468,12 +468,12 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return isCapable(DBLITERAL_CORRELATION_NAME); } @@ -483,57 +483,57 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return getInt32Property("Catalog Location") == DBPROPVAL_CL_START; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_IGNORE; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_COMMIT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DML; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_ALL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return getInt32Property("Prepare Abort Behavior") == DBPROPVAL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return getInt32Property("Prepare Commit Behavior") == DBPROPVAL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return (getInt32Property("Isolation Retention") & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return (getInt32Property("Isolation Retention") & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { bool bValue(false); @@ -557,25 +557,25 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return (getInt32Property("Schema Usage") & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return (getInt32Property("Schema Usage") & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; } @@ -590,7 +590,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -600,14 +600,14 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return true; return getBoolProperty("Outer Join Capabilities"); } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { return new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); } @@ -617,132 +617,132 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { return getMaxSize(DBLITERAL_PROCEDURE_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { return getMaxSize(DBLITERAL_SCHEMA_NAME); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_NONE; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return getBoolProperty("Read-Only Data Source"); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NULL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { return isCapable(DBLITERAL_COLUMN_ALIAS); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { return isCapable(DBLITERAL_CORRELATION_NAME); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return getBoolProperty("Rowset Conversions on Command"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return getBoolProperty("ORDER BY Columns in Select List"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return getInt32Property("GROUP BY Support") != DBPROPVAL_GB_NOT_SUPPORTED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { return getInt32Property("GROUP BY Support") != DBPROPVAL_GB_CONTAINS_SELECT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { return getInt32Property("GROUP BY Support") == DBPROPVAL_GB_NO_RELATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return isCapable(DBLITERAL_ESCAPE_PERCENT); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return getBoolProperty("ORDER BY Columns in Select List"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } @@ -752,123 +752,123 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return (getInt32Property("Schema Usage") & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE); } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { return "sdbc:ado:"+ m_pADOConnection->GetConnectionString(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { return getStringProperty("User Name"); } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { return getStringProperty("Provider Friendly Name"); } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) { return getStringProperty("Provider Version"); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { return getStringProperty("DBMS Version"); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { return getStringProperty("DBMS Name"); } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { return getStringProperty("Procedure Term"); } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { return getStringProperty("Schema Term"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { sal_Int32 nRet = TransactionIsolation::NONE; switch(m_pADOConnection->get_IsolationLevel()) @@ -891,12 +891,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(S return nRet; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { ADORecordset *pRecordset = nullptr; OLEVariant vtEmpty; @@ -926,146 +926,146 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, Runt return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { return getLiteral(DBLITERAL_ESCAPE_PERCENT); } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { OUString aValue; return aValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return true; return (getInt32Property("Outer Join Capabilities") & 0x00000004L) == 0x00000004L; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return supportsFullOuterJoins( ); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { return getInt32Property("Max Columns in GROUP BY"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { return getInt32Property("Max Columns in ORDER BY"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { return getMaxSize(DBLITERAL_USER_NAME); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return true; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XDatabaseMetaData::getUDTs", *this ); return Reference< XResultSet >(); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 1a479721fe4e..381113c431fe 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -255,42 +255,42 @@ void ODatabaseMetaDataResultSetMetaData::setProceduresMap() DataType::VARCHAR); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSearchable(); return true; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isAutoIncrement(); return false; } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnServiceName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) { if(!m_mColumns.empty() && (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) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getCatalogName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnTypeName(); @@ -298,7 +298,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCaseSensitive(); @@ -306,7 +306,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getSchemaName(); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 69269348dbbf..09ee0797e09c 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -93,13 +93,13 @@ void ODatabaseMetaDataResultSet::disposing() m_xMetaData.clear(); } -Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -108,14 +108,14 @@ css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTyp return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes()); } -void ODatabaseMetaDataResultSet::checkRecordSet() throw(SQLException) +void ODatabaseMetaDataResultSet::checkRecordSet() { if(!m_pRecordSet) throwFunctionSequenceException(*this); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -137,7 +137,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum } #define BLOCK_SIZE 256 -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -180,14 +180,14 @@ Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinar return new SequenceInputStream(m_aValue.getByteSequence()); } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +201,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex } -sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -220,31 +220,31 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) t } -Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) { return getValue(columnIndex).getByteSequence(); } -css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) { return getValue(columnIndex).getDate(); } -double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) { return getValue(columnIndex).getDouble(); } -float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) { return getValue(columnIndex).getFloat(); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -264,21 +264,21 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) { ::dbtools::throwFeatureNotImplementedSQLException( "XResultSet::getRow", *this ); return 0; } -sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getLong", *this ); return sal_Int64(0); } -Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -292,34 +292,34 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData return m_xMetaData; } -Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -332,7 +332,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const } -sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -351,7 +351,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) } -OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -368,19 +368,19 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) { return getValue(columnIndex).getTime(); } -css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue(columnIndex).getDateTime(); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -393,7 +393,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException return bIsAtEOF == VARIANT_TRUE; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -404,7 +404,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, Ru return m_nRowPos == 1; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -415,7 +415,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run return true; } -void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -427,7 +427,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, Ru previous(); } -void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -441,7 +441,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, Runt } -void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -452,7 +452,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -468,7 +468,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, Runt } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -477,7 +477,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, Runti return m_pRecordSet && SUCCEEDED(m_pRecordSet->MoveLast()); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -495,7 +495,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -512,7 +512,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -527,13 +527,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R return bRet; } -Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) { return m_aStatement.get(); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -546,7 +546,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, return (RecordStatusEnum(eRec) & adRecDeleted) == adRecDeleted; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -558,7 +558,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException return (RecordStatusEnum(eRec) & adRecNew) == adRecNew; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -572,7 +572,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -587,7 +587,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLExcepti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -606,7 +606,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -617,7 +617,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru return m_aValue.isNull(); } -void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -629,7 +629,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, Run } -void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -640,35 +640,31 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) m_pRecordSet->Cancel(); } -void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) { } -Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) { return Any(); } sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetConcurrency::READ_ONLY; } sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetType::FORWARD_ONLY; } sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; } sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=-1; if(m_pRecordSet) @@ -677,20 +673,17 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const } OUString ODatabaseMetaDataResultSet::getCursorName() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); } void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 /*_par0*/) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this ); } void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { if(m_pRecordSet) m_pRecordSet->put_CacheSize(_par0); @@ -726,7 +719,6 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { switch(nHandle) { @@ -748,7 +740,6 @@ void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (Exception) { switch(nHandle) { @@ -1193,12 +1184,12 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() ODatabaseMetaDataResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 4b35c93c6436..9a035e298993 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -36,7 +36,7 @@ ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData() m_pRecordSet->Release(); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { sal_Int32 nSize = 0; if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -51,7 +51,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) { sal_Int32 nType = 0; if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -65,7 +65,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) { if(!m_pRecordSet) return 0; @@ -83,7 +83,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw( } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +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(); @@ -96,7 +96,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 c return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +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(); @@ -104,7 +104,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +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(); @@ -119,7 +119,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) +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(); @@ -133,7 +133,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column return false; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +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(); @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 c return 0; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) +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(); @@ -160,7 +160,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) +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(); @@ -177,7 +177,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isReadOnly(); @@ -194,7 +194,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 colu } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isDefinitelyWritable(); @@ -211,7 +211,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_ ; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isWritable(); diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 7d14a58206ae..0494334904ec 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -78,12 +78,12 @@ void ODriver::disposing() } // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.ado.ODriver"); } -Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -91,30 +91,30 @@ Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (Runtime return aSNS; } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver(_rxFactory)); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) return nullptr; @@ -130,7 +130,6 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) { return url.startsWith("sdbc:ado:"); } @@ -145,7 +144,7 @@ void ODriver::impl_checkURL_throw(const OUString& _sUrl) } // if ( !acceptsURL(_sUrl) ) } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { impl_checkURL_throw(url); if ( acceptsURL(url) ) @@ -182,18 +181,18 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL ODriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODriver::getMinorVersion( ) { return 0; } // XDataDefinitionSupplier -Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -233,14 +232,14 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co return xTab; } -Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { impl_checkURL_throw(url); return getDataDefinitionByConnection(connect(url,info)); } -void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) +void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) { ADOErrors *pErrors = nullptr; _pAdoCon->get_Errors(&pErrors); diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index ab1eb1f3a9c0..f8c61dee557a 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -99,7 +99,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -107,7 +107,7 @@ sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run } -void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aGroup.IsValid()) { @@ -139,12 +139,12 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } -sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) { return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType))); } -sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType)); if(eNum & adRightWithGrant) @@ -152,12 +152,12 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, s return 0; } -void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges)); } -void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges)); } diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index cc3208e232bf..2611ace16372 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -44,7 +44,7 @@ sdbcx::ObjectType OGroups::createObject(const OUString& _rName) return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName); } -void OGroups::impl_refresh() throw(RuntimeException) +void OGroups::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index b907873cd443..b33f57ab3f6a 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -89,14 +89,14 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : sdbcx::OIndex::getSomething(rId); } -void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aIndex.IsValid()) { diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index b931984bd182..5bf8937af21f 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -43,7 +43,7 @@ sdbcx::ObjectType OIndexes::createObject(const OUString& _rName) return new OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } -void OIndexes::impl_refresh() throw(RuntimeException) +void OIndexes::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index cc1e13c1e5e8..2df0c8775a80 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -84,14 +84,14 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : OKey_ADO::getSomething(rId); } -void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aKey.IsValid()) { diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 257c0be04602..4a48330d7f57 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -49,7 +49,7 @@ sdbcx::ObjectType OKeys::createObject(const OUString& _rName) return new OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } -void OKeys::impl_refresh() throw(RuntimeException) +void OKeys::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index a29e00d79fb5..136c3a90b377 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -92,7 +92,7 @@ OPreparedStatement::~OPreparedStatement() } } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_Base::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -101,7 +101,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt static_cast< XResultSetMetaDataSupplier*>(this)); } -css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(), cppu::UnoType<XParameters>::get(), @@ -110,7 +110,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) t return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { if(!m_xMetaData.is() && m_RecordSet.IsValid()) m_xMetaData = new OResultSetMetaData(m_RecordSet); @@ -128,7 +128,7 @@ m_xMetaData.clear(); OStatement_Base::disposing(); } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::close( ) { { @@ -140,7 +140,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -164,7 +164,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc return m_RecordSet.IsValid(); } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -183,7 +183,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType, - sal_Int32 _nSize,const OLEVariant& Val) throw(SQLException, RuntimeException) + sal_Int32 _nSize,const OLEVariant& Val) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -236,12 +236,12 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn ADOS::ThrowException(*m_pConnection->getConnection(),*this); } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x ); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -249,7 +249,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ return static_cast<Reference< XConnection >>(m_pConnection); } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -284,79 +284,79 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE return xRs; } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { setParameter(parameterIndex,adBoolean,sizeof(x),bool(x)); } -void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { setParameter(parameterIndex,adTinyInt,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& x ) { setParameter(parameterIndex,adDBDate,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) { setParameter(parameterIndex,adDBTime,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& x ) { setParameter(parameterIndex,adDBTimeStamp,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { setParameter(parameterIndex,adDouble,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { setParameter(parameterIndex,adSingle,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { setParameter(parameterIndex,adInteger,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { setParameter(parameterIndex,adBigInt,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) { OLEVariant aVal; aVal.setNull(); setParameter(parameterIndex,adEmpty,0,aVal); } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setClob", *this ); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setBlob", *this ); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { switch(sqlType) { @@ -370,12 +370,12 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { setNull(parameterIndex,sqlType); } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -387,22 +387,22 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any } } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { setParameter(parameterIndex,adSmallInt,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { setParameter(parameterIndex,adVarBinary,sizeof(sal_Int8)*x.getLength(),x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(x.is()) { @@ -412,7 +412,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::clearParameters( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 46f1e86aca1c..1e2c5b76e44f 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -54,17 +54,17 @@ using namespace com::sun::star::sdbc; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw (css::uno::RuntimeException) +OUString SAL_CALL OResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.ado.ResultSet"); } -css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) { return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"}; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -127,13 +127,13 @@ m_xStatement.clear(); m_xMetaData.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -143,7 +143,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(css } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -165,7 +165,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ } #define BLOCK_SIZE 256 -Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -205,13 +205,13 @@ Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int return m_aValue.isNull() ? nullptr : new ::comphelper::SequenceInputStream(m_aValue.getByteSequence()); } -Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -221,49 +221,49 @@ OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, Runt return m_aValue; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) { return getValue(columnIndex).getBool(); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) { return getValue(columnIndex).getInt8(); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) { return getValue(columnIndex).getByteSequence(); } -css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) { return getValue(columnIndex).getDate(); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) { return getValue(columnIndex).getDouble(); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) { return getValue(columnIndex).getFloat(); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) { return getValue(columnIndex).getInt32(); } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -276,14 +276,14 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getLong", *this ); return sal_Int64(0); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -294,64 +294,64 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return getValue(columnIndex).makeAny(); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) { return getValue(columnIndex).getInt16(); } -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) { return getValue(columnIndex).getString(); } -css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) { return getValue(columnIndex).getTime(); } -css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue(columnIndex).getDateTime(); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -362,7 +362,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return bIsAtEOF == VARIANT_TRUE; } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -371,7 +371,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) return m_nRowPos == 1; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -380,7 +380,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) return true; } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -390,7 +390,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) m_bOnFirstAfterOpen = !previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -402,7 +402,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -413,7 +413,7 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -429,7 +429,7 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::last( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -444,7 +444,7 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) return bRet; } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -477,7 +477,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt return bCheck; } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -497,7 +497,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt return bRet; } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -511,7 +511,7 @@ sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) return bRet; } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -519,7 +519,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -533,7 +533,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio return bRet; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -546,7 +546,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return bRet; } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -558,7 +558,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -575,7 +575,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -606,7 +606,7 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -616,7 +616,7 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL OResultSet::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -625,16 +625,16 @@ void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) m_pRecordSet->Cancel(); } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::clearWarnings( ) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getWarnings( ) { return Any(); } -void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::insertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -645,7 +645,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) m_pRecordSet->AddNew(aEmpty,aEmpty); } -void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -656,7 +656,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) m_pRecordSet->Update(aEmpty,aEmpty); } -void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::deleteRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -667,7 +667,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::cancelRowUpdates( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -677,7 +677,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToInsertRow( ) { // ::osl::MutexGuard aGuard( m_aMutex ); //checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -686,7 +686,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToCurrentRow( ) { } @@ -699,7 +699,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,const OLEVariant& x) aField.PutValue(x); } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) { OLEVariant x; x.setNull(); @@ -707,72 +707,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException } -void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex,bool(x)); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -782,7 +782,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateBytes(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -792,7 +792,7 @@ void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Re updateBytes(columnIndex,aSeq); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -801,21 +801,21 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) m_pRecordSet->Resync(adAffectCurrent); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } -void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } // XRowLocate -Any SAL_CALL OResultSet::getBookmark( ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -830,7 +830,7 @@ Any SAL_CALL OResultSet::getBookmark( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -845,7 +845,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLExc return SUCCEEDED(m_pRecordSet->Move(0,m_aBookmarks[nPos])); } -sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -860,7 +860,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos])); } -sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -879,7 +879,7 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any return ((sal_Int32)eNum) - 1; } -sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -905,7 +905,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim return bValue; } -sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -917,7 +917,7 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLExce } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -966,7 +966,6 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro } sal_Int32 OResultSet::getResultSetConcurrency() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=ResultSetConcurrency::READ_ONLY; LockTypeEnum eRet; @@ -986,7 +985,6 @@ sal_Int32 OResultSet::getResultSetConcurrency() const } sal_Int32 OResultSet::getResultSetType() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=0; CursorTypeEnum eRet; @@ -1011,13 +1009,11 @@ sal_Int32 OResultSet::getResultSetType() const } sal_Int32 OResultSet::getFetchDirection() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; } sal_Int32 OResultSet::getFetchSize() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=-1; m_pRecordSet->get_CacheSize(&nValue); @@ -1025,20 +1021,17 @@ sal_Int32 OResultSet::getFetchSize() const } OUString OResultSet::getCursorName() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); } void OResultSet::setFetchDirection(sal_Int32 /*_par0*/) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this ); } void OResultSet::setFetchSize(sal_Int32 _par0) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { m_pRecordSet->put_CacheSize(_par0); } @@ -1077,7 +1070,6 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { switch(nHandle) { @@ -1097,7 +1089,7 @@ sal_Bool OResultSet::convertFastPropertyValue( return false; } -void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -1157,7 +1149,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index dc0b046c3552..37e7b2d2e3b2 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -44,7 +44,7 @@ OResultSetMetaData::~OResultSetMetaData() m_pRecordSet->Release(); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid() && aField.GetActualSize() != -1) @@ -53,14 +53,14 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); return ADOS::MapADOType2Jdbc(aField.GetADOType()); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { if(m_nColCount != -1 ) return m_nColCount; @@ -76,7 +76,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) { bool bRet = false; WpADOField aField = ADOS::getField(m_pRecordSet,column); @@ -90,13 +90,13 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -105,7 +105,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ return OUString(); } -OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) { OUString sTableName; @@ -119,28 +119,28 @@ OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQL return sTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -151,7 +151,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) { bool bRet = false; WpADOField aField = ADOS::getField(m_pRecordSet,column); @@ -167,7 +167,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -178,7 +178,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLExce return false; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -186,7 +186,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return 0; } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -195,7 +195,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::s } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -206,13 +206,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) { return true; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -223,7 +223,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -234,7 +234,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) t ; } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return isDefinitelyWritable(column); } diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 2afe88141be7..025be1b95b37 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -113,13 +113,13 @@ void SAL_CALL OStatement_Base::release() throw() release_ChildImpl(); } -Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) { Any aRet = OStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -129,7 +129,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes( ) thro } -void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) +void SAL_CALL OStatement_Base::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -139,7 +139,7 @@ void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) } -void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement_Base::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -150,13 +150,13 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) } -void SAL_CALL OStatement::clearBatch( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement::clearBatch( ) { } -void OStatement_Base::reset() throw (SQLException) +void OStatement_Base::reset() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -172,7 +172,7 @@ void OStatement_Base::reset() throw (SQLException) // If a ResultSet was created for this Statement, close it -void OStatement_Base::clearMyResultSet () throw (SQLException) +void OStatement_Base::clearMyResultSet () { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -189,7 +189,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) m_xResultSet.clear(); } -sal_Int32 OStatement_Base::getRowCount () throw( SQLException) +sal_Int32 OStatement_Base::getRowCount () { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -228,7 +228,7 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType) // Sets the warning -void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) +void OStatement_Base::setWarning (const SQLWarning &ex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -249,7 +249,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS ) m_RecordSet.PutRefDataSource( static_cast<IDispatch*>(m_Command) ); } -sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -279,7 +279,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep return m_RecordSet.IsValid(); } -Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -316,7 +316,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& } -Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -326,14 +326,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLEx } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this)); return aRet.hasValue() ? aRet : OStatement_Base::queryInterface(rType); } -void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement::addBatch( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -342,7 +342,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, Ru m_aBatchList.push_back(sql); } -Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -387,7 +387,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } -sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -414,7 +414,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S } -Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -424,7 +424,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLExce } -sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -437,7 +437,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, Runti } -sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -470,7 +470,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } -Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OStatement_Base::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -480,7 +480,7 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement_Base::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -490,12 +490,12 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce } -sal_Int32 OStatement_Base::getQueryTimeOut() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getQueryTimeOut() const { return m_Command.get_CommandTimeout(); } -sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getMaxRows() const { ADO_LONGPTR nRet=-1; if(!(m_RecordSet.IsValid() && m_RecordSet.get_MaxRecords(nRet))) @@ -503,7 +503,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti return nRet; } -sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getResultSetConcurrency() const { sal_Int32 nValue; @@ -520,7 +520,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, R return nValue; } -sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getResultSetType() const { sal_Int32 nValue=0; switch(m_eCursorType) @@ -540,27 +540,27 @@ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeE return nValue; } -sal_Int32 OStatement_Base::getFetchDirection() throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getFetchDirection() { return FetchDirection::FORWARD; } -sal_Int32 OStatement_Base::getFetchSize() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getFetchSize() const { return m_nFetchSize; } -sal_Int32 OStatement_Base::getMaxFieldSize() throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getMaxFieldSize() { return 0; } -OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException) +OUString OStatement_Base::getCursorName() const { return m_Command.GetName(); } -void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, RuntimeException) +void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -569,7 +569,7 @@ void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, Run m_Command.put_CommandTimeout(seconds); } -void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setMaxRows(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -577,7 +577,7 @@ void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeExc m_nMaxRows = _par0; } -void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -593,7 +593,7 @@ void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLExceptio } } -void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setResultSetType(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -613,14 +613,14 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, Runt } } -void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) +void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedSQLException( "Statement::FetchDirection", *this ); } -void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setFetchSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -629,14 +629,14 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE m_nFetchSize = _par0; } -void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) +void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedSQLException( "Statement::MaxFieldSize", *this ); } -void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) +void OStatement_Base::setCursorName(const OUString &_par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -685,7 +685,6 @@ sal_Bool OStatement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { bool bModified = false; @@ -734,7 +733,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( return bModified; } -void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -828,7 +827,7 @@ void SAL_CALL OStatement::release() throw() OStatement_Base::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 23ddfff70979..6ef5fb391462 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -141,7 +141,7 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -149,7 +149,7 @@ sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run } // XRename -void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OAdoTable::rename( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -166,7 +166,7 @@ Reference< XDatabaseMetaData> OAdoTable::getMetaData() const } // XAlterTable -void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -186,7 +186,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer refreshColumns(); } -void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException) +void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -197,7 +197,7 @@ void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< X alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor); } -void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aTable.IsValid()) { @@ -229,7 +229,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue); } -OUString SAL_CALL OAdoTable::getName() throw(css::uno::RuntimeException) +OUString SAL_CALL OAdoTable::getName() { return m_aTable.get_Name(); } diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index bc3e9883578b..6f0a502642fb 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -49,7 +49,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return new OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName)); } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); m_aCollection.Refresh(); diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index d874eb2638b6..447789f6a8fb 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -83,7 +83,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -91,7 +91,7 @@ sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (Runt } -void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aUser.IsValid()) { @@ -151,7 +151,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() return *OUserExtend_PROP::getArrayHelper(); } -sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 o return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType))); } -sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -172,7 +172,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sa return nRights; } -void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -180,7 +180,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objT ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } -void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -189,7 +189,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 obj } // XUser -void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index b136fe944d9a..74c22bd520d5 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -42,7 +42,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName) return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName); } -void OUsers::impl_refresh() throw(RuntimeException) +void OUsers::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 494e2dda8fc8..f39e93577597 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -58,7 +58,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoView::getSomething( const 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/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index fb3336e2f2a3..d15fbf631657 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -45,7 +45,7 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName) return pView; } -void OViews::impl_refresh( ) throw(RuntimeException) +void OViews::impl_refresh( ) { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 51498dacfd24..f7e2667b3cdb 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -305,7 +305,7 @@ sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights) return eRights; } -WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException) +WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) { if ( !_pRecordSet ) return WpADOField(); |