diff options
Diffstat (limited to 'connectivity/source/drivers')
291 files changed, 5749 insertions, 6774 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(); diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index c187256ecbda..04b37c071993 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -60,7 +60,6 @@ OCalcConnection::~OCalcConnection() } void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) - throw(SQLException, RuntimeException, DeploymentException, std::exception) { // open file @@ -202,7 +201,7 @@ void OCalcConnection::disposing() IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connection", "com.sun.star.sdbc.Connection") -Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -233,7 +232,7 @@ css::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog() } -Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -246,7 +245,6 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -261,7 +259,6 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 47986d4119a4..795c72103152 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -138,7 +138,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -232,7 +232,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( } -OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -240,28 +240,28 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) { return 1; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) { return 256; } @@ -341,7 +341,6 @@ static bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUSt Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 2e207f841089..4ac9899e5042 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -36,12 +36,12 @@ using namespace ::com::sun::star::lang; // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.calc.ODriver"); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } @@ -51,13 +51,13 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::calc::ODriver_CreateInstance(const css::uno::Reference< - css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) + css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, - const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) + const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -75,12 +75,11 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:calc:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( !acceptsURL(url) ) { diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index dc175865151e..b13f14a037f0 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -43,12 +43,12 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, cppu::UnoType<bool>::get()); } -OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OCalcResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.calc.ResultSet"); } -Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -56,25 +56,25 @@ Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw return aSupported; } -sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) { Any aRet = OResultSet::queryInterface(rType); return aRet.hasValue() ? aRet : OCalcResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OCalcResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OCalcResultSet::getTypes( ) { return ::comphelper::concatSequences(OResultSet::getTypes(),OCalcResultSet_BASE::getTypes()); } // XRowLocate -Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL OCalcResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -83,7 +83,7 @@ Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeExcept return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } -sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -94,7 +94,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw( return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true); } -sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -108,17 +108,17 @@ sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, } -sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) { return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL; } -sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -128,7 +128,7 @@ sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( S } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw( SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -166,7 +166,7 @@ void SAL_CALL OCalcResultSet::release() throw() OCalcResultSet_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index cae94275f944..97cf3fa98fcf 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -642,7 +642,7 @@ void SAL_CALL OCalcTable::disposing() } -Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OCalcTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); ::std::vector<Type> aOwnTypes; @@ -665,7 +665,7 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std:: } -Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType<XKeysSupplier>::get()|| rType == cppu::UnoType<XIndexesSupplier>::get()|| @@ -696,7 +696,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OCalcTable::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/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index 126514003ba3..c4730d75b6a8 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -46,7 +46,7 @@ sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName) } -void ODbaseColumns::impl_refresh() throw(RuntimeException) +void ODbaseColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index 5c5c0d232fd9..0a56d952e49b 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -53,7 +53,7 @@ ODbaseConnection::~ODbaseConnection() IMPLEMENT_SERVICE_INFO(ODbaseConnection, "com.sun.star.sdbc.drivers.dbase.Connection", "com.sun.star.sdbc.Connection") -Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -82,7 +82,7 @@ css::uno::Reference< XTablesSupplier > ODbaseConnection::createCatalog() return xTab; } -Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -93,7 +93,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQL return xReturn; } -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -106,7 +106,7 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con return pStmt; } -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 1293e9fa71fd..758f5a9d097a 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -154,7 +154,7 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -254,7 +254,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table, - sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception) + sal_Bool unique, sal_Bool /*approximate*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -328,48 +328,48 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( return xRef; } -OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return "sdbc:dbase:" + m_pConnection->getURL(); } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) { return 254; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) { return 10; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) { return 1; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) { return 128; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) { return true; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) { return false; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index cf0967fcc303..21ecbe05ac8c 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -35,24 +35,24 @@ using namespace ::com::sun::star::lang; // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.dbase.ODriver"); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } -Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -69,12 +69,12 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S return xCon; } -sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) { return url.startsWith("sdbc:dbase:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 416ad8d6653f..283700649dea 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -123,7 +123,7 @@ Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelImplementationId() // XUnoTunnel -sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 ODbaseIndex::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/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 951c0982f41b..9a586b162edd 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -65,7 +65,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName) } -void ODbaseIndexColumns::impl_refresh() throw(RuntimeException) +void ODbaseIndexColumns::impl_refresh() { m_pIndex->refreshColumns(); } diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index 34e98ec25e9b..f1a722615335 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.cxx @@ -78,7 +78,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName) return xRet; } -void ODbaseIndexes::impl_refresh( ) throw(RuntimeException) +void ODbaseIndexes::impl_refresh( ) { if(m_pTable) m_pTable->refreshIndexes(); diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index a93fde690981..cc133550114f 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -46,12 +46,12 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, cppu::UnoType<bool>::get()); } -OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL ODbaseResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.dbase.ResultSet"); } -Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -59,25 +59,25 @@ Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) thro return aSupported; } -sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) { Any aRet = ODbaseResultSet_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet::queryInterface(rType); } - Sequence< Type > SAL_CALL ODbaseResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL ODbaseResultSet::getTypes( ) { return ::comphelper::concatSequences(OResultSet::getTypes(),ODbaseResultSet_BASE::getTypes()); } // XRowLocate -Any SAL_CALL ODbaseResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL ODbaseResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -86,7 +86,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark( ) throw( SQLException, RuntimeExcep return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } -sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -97,7 +97,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw( return m_pTable.is() && Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true); } -sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -111,7 +111,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, } -sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) { sal_Int32 nFirst(0),nSecond(0),nResult(0); if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) @@ -131,12 +131,12 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& return nResult; } -sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -146,7 +146,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) throw( } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw( SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -207,7 +207,7 @@ void SAL_CALL ODbaseResultSet::release() throw() ODbaseResultSet_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 0229fae7ee46..0408c7929f81 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -727,7 +727,7 @@ void SAL_CALL ODbaseTable::disposing() m_aColumns = nullptr; } -Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); ::std::vector<Type> aOwnTypes; @@ -748,7 +748,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std: } -Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType<XKeysSupplier>::get()|| rType == cppu::UnoType<XDataDescriptorFactory>::get()) @@ -776,7 +776,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -2146,7 +2146,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr // XAlterTable -void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2165,7 +2165,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref } } -void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2301,7 +2301,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const return getConnection()->getMetaData(); } -void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) +void SAL_CALL ODbaseTable::rename( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2357,7 +2357,7 @@ namespace } } -void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) +void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 04211f521b5d..a2a5add764e3 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -56,7 +56,7 @@ sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName) return xRet; } -void ODbaseTables::impl_refresh( ) throw(RuntimeException) +void ODbaseTables::impl_refresh( ) { static_cast<ODbaseCatalog*>(&m_rParent)->refreshTables(); } @@ -124,7 +124,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos, const OUString& _sElementName) } } -Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) { typedef sdbcx::OCollection OTables_BASE; return OTables_BASE::queryInterface(rType); diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index acc455a96e41..b0f9945b116d 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -61,7 +61,7 @@ void OEvoabCatalog::refreshTables() m_pTables = new OEvoabTables(m_xMetaData,*this,m_aMutex,aVector); } // XTablesSupplier -Reference< XNameAccess > SAL_CALL OEvoabCatalog::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OEvoabCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index 05afef5554d7..617a0cfe64f3 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -39,7 +39,7 @@ namespace connectivity virtual void refreshUsers() override {} // XTablesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index 812911e4e40e..46c42c69b137 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.cxx @@ -81,7 +81,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName) return xRet; } -void OEvoabColumns::impl_refresh() throw(RuntimeException) +void OEvoabColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index d405efb83b10..e7e2065a5ac5 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity OEvoabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OEvoabColumns( OEvoabTable* _pTable, diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index a9975170727c..fa6fd275e5b6 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -69,7 +69,7 @@ void SAL_CALL OEvoabConnection::release() throw() IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection") -void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) +void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) { osl_atomic_increment( &m_refCount ); SAL_INFO("connectivity.evoab2", "OEvoabConnection::construct()::url = " << url ); @@ -100,13 +100,13 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa } -OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) { // when you need to transform SQL92 to you driver specific you can do it here return _sSql; } -Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -134,7 +134,7 @@ css::uno::Reference< XTablesSupplier > OEvoabConnection::createCatalog() return xTab; } -Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -146,7 +146,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQL return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -159,12 +159,12 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( con return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; } -sal_Bool SAL_CALL OEvoabConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; @@ -172,7 +172,7 @@ sal_Bool SAL_CALL OEvoabConnection::isClosed( ) throw(SQLException, RuntimeExce // XCloseable -void SAL_CALL OEvoabConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::close( ) { { // we just dispose us ::osl::MutexGuard aGuard( m_aMutex ); @@ -183,11 +183,11 @@ void SAL_CALL OEvoabConnection::close( ) throw(SQLException, RuntimeException, // XWarningsSupplier -Any SAL_CALL OEvoabConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OEvoabConnection::getWarnings( ) { return m_aWarnings.getWarnings(); } -void SAL_CALL OEvoabConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::clearWarnings( ) { m_aWarnings.clearWarnings(); } @@ -202,53 +202,53 @@ void OEvoabConnection::disposing() } // -------------------------------- stubbed methods ------------------------------------------------ -void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setAutoCommit", *this ); } -sal_Bool SAL_CALL OEvoabConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabConnection::getAutoCommit( ) { return true; } -void SAL_CALL OEvoabConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::commit( ) { } -void SAL_CALL OEvoabConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::rollback( ) { } -void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setReadOnly", *this ); } -sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) { return false; } -void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabConnection::getCatalog( ) { return OUString(); } -void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation( ) { return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::getTypeMap", *this ); return nullptr; } -void SAL_CALL OEvoabConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index bc1a39608f23..903d7255885a 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -66,7 +66,7 @@ namespace connectivity public: explicit OEvoabConnection( OEvoabDriver& _rDriver ); /// @throws css::sdbc::SQLException - virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) throw( css::sdbc::SQLException); + virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ); inline OString const & getPassword() { return m_aPassword; } inline void setPassword( OString const & aStr ) { m_aPassword = aStr; } @@ -86,30 +86,30 @@ namespace connectivity // XConnection virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 11fa505f6ee5..440a62b24d4f 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -322,47 +322,47 @@ OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) return OUString(); } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable( ) { return 0;// 0 means no limit } @@ -372,7 +372,7 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxStatements_throw( ) return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) { return 0;// 0 means no limit } @@ -384,17 +384,17 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } @@ -404,17 +404,17 @@ bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } @@ -429,17 +429,17 @@ bool OEvoabDatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return false; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength( ) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) { OUString aVal; return aVal; @@ -452,13 +452,13 @@ OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return aVal; } -OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } @@ -468,57 +468,57 @@ bool OEvoabDatabaseMetaData::impl_isCatalogAtStart_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) { return false; } @@ -528,22 +528,22 @@ bool OEvoabDatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } @@ -558,7 +558,7 @@ bool OEvoabDatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -568,145 +568,145 @@ bool OEvoabDatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength( ) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable( ) { // We allow you to select from any table. return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly( ) { // For now definitely read-only, no support for update/delete return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing( ) { // todo add Support for this. return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } @@ -717,271 +717,271 @@ bool OEvoabDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() { return OUString( "1" ); } -OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) { return OUString( "0" ); } -OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength( ) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) { return false; } @@ -991,7 +991,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLExce // of course you could implement it on your and you should do this because // the general way is more memory expensive -Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) { /* Don't need to change as evoab driver supports only table */ @@ -1069,7 +1069,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -1091,7 +1091,7 @@ bool isSourceBackend(ESource *pSource, const char *backendname) Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1227,7 +1227,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; } -Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XDatabaseMetaDaza::getUDTs", *this ); return nullptr; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 5d2d7645b3cb..39a9b2adaa54 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -91,129 +91,129 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index d4a7baa033cd..bc98a3f18fb3 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -79,7 +79,7 @@ void OEvoabDriver::disposing() // static ServiceInfo -OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OEvoabDriver::getImplementationName_Static( ) { return OUString(EVOAB_DRIVER_IMPL_NAME); // this name is referenced in the configuration and in the evoab.xml @@ -87,7 +87,7 @@ OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) } -Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) { // which service is supported // for more information @see com.sun.star.sdbc.Driver @@ -95,28 +95,28 @@ Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (Ru return aSNS; } -OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OEvoabDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new OEvoabDriver(_rxFactory)); } -Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -134,13 +134,12 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, co } sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return acceptsURL_Stat(url); } -Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( ! acceptsURL(url) ) { @@ -154,12 +153,12 @@ Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUS } -sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) { return 0; } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 952b9a060e5e..c0570e9186ce 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -34,7 +34,7 @@ namespace connectivity namespace evoab { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); + css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, @@ -58,22 +58,22 @@ namespace connectivity // XInterface /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; public: const css::uno::Reference< css::lang::XMultiServiceFactory > diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 4a11eb341ac2..f9448f098fe0 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -82,7 +82,7 @@ void SAL_CALL OEvoabPreparedStatement::release() throw() } -Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement::queryInterface(rType); if(!aRet.hasValue()) @@ -90,13 +90,13 @@ Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw return aRet; } -Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes( ) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -107,7 +107,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( } -void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::close( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -125,7 +125,7 @@ void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeExce } -sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -135,7 +135,7 @@ sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, Runti } -sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -144,13 +144,13 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException } -void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setString", *this ); } -Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -159,7 +159,7 @@ Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) thr } -Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -168,103 +168,103 @@ Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) throw } -void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBoolean", *this ); } -void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setByte", *this ); } -void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setDate", *this ); } -void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setTime", *this ); } -void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setTimestamp", *this ); } -void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setDouble", *this ); } -void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setFloat", *this ); } -void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setInt", *this ); } -void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setLong", *this ); } -void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setNull", *this ); } -void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setObjectWithInfo", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setObjectNull", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -277,45 +277,45 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons } -void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setShort", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBytes", *this ); } -void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBinaryStream", *this ); } -void SAL_CALL OEvoabPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::clearParameters( ) { } -Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet( ) { return nullptr; } -sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount( ) { return 0; } -sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults( ) { return false; } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 2c64888d3ee6..95cdc50d3176 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -80,49 +80,49 @@ namespace connectivity protected: DECLARE_SERVICE_INFO(); //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index c01026062c4c..d33c8f2a4512 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -65,18 +65,18 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; -OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.evoab.ResultSet"); } - Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported { "com.sun.star.sdbc.ResultSet" }; return aSupported; } -sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -720,7 +720,7 @@ void OEvoabResultSet::disposing() m_xMetaData.clear(); } -Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) { Any aRet = ::comphelper::OPropertyContainer::queryInterface(rType); if(!aRet.hasValue()) @@ -728,7 +728,7 @@ Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(Runtime return aRet; } -Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException, std::exception) +Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) { return ::comphelper::concatSequences( OResultSet_BASE::getTypes(), @@ -746,7 +746,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException, * If the equivalent NResultSetMetaData.cxx marks the columntype of * nColumnNum as DataType::VARCHAR this accessor is used. */ -OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -761,7 +761,7 @@ OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLEx return aResult; } -sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -777,103 +777,103 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE return bResult; } -sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getLong", *this ); return sal_Int64(); } -Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getShort", *this ); return 0; } -css::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTime", *this ); return css::util::Time(); } -util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTimestamp", *this ); return css::util::DateTime(); } -Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBinaryStream", *this ); return nullptr; } -Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getByte", *this ); return 0; } -Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBytes", *this ); return Sequence< sal_Int8 >(); } -css::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getDate", *this ); return css::util::Date(); } -double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getDouble", *this ); return 0; } -float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getFloat", *this ); return 0; } -sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getInt", *this ); return 0; @@ -882,7 +882,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQL // XResultSetMetaDataSupplier Interface -Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -895,7 +895,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) throw( // XResultSet Interface -sal_Bool SAL_CALL OEvoabResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -907,7 +907,7 @@ sal_Bool SAL_CALL OEvoabResultSet::next( ) throw(SQLException, RuntimeException return false; } -sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -915,7 +915,7 @@ sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) throw(SQLException, RuntimeExcept return m_bWasNull; } -sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -923,7 +923,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) throw(SQLException, Runtime return m_nIndex < 0; } -sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -931,7 +931,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) throw(SQLException, RuntimeExcept return m_nIndex; } -sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -939,7 +939,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) throw(SQLException, RuntimeEx return m_nIndex >= m_nLength; } -sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -947,7 +947,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) throw(SQLException, RuntimeExcept return m_nIndex == 0; } -sal_Bool SAL_CALL OEvoabResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -955,7 +955,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isLast( ) throw(SQLException, RuntimeExcepti return m_nIndex == m_nLength - 1; } -void SAL_CALL OEvoabResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -963,7 +963,7 @@ void SAL_CALL OEvoabResultSet::beforeFirst( ) throw(SQLException, RuntimeExcept m_nIndex = -1; } -void SAL_CALL OEvoabResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -972,7 +972,7 @@ void SAL_CALL OEvoabResultSet::afterLast( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OEvoabResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -982,7 +982,7 @@ sal_Bool SAL_CALL OEvoabResultSet::first( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OEvoabResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::last( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -991,7 +991,7 @@ sal_Bool SAL_CALL OEvoabResultSet::last( ) throw(SQLException, RuntimeException return true; } -sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1003,7 +1003,7 @@ sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, return false; } -sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1016,7 +1016,7 @@ sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, return false; } -sal_Bool SAL_CALL OEvoabResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1029,7 +1029,7 @@ sal_Bool SAL_CALL OEvoabResultSet::previous( ) throw(SQLException, RuntimeExcep return false; } -Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1038,7 +1038,7 @@ css::uno::WeakReferenceHelper aStatement(static_cast<OWeakObject*>(m_pState } -sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1046,7 +1046,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) throw(SQLException, RuntimeExc return false; } -sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1054,7 +1054,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) throw(SQLException, RuntimeEx return false; } -sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1062,7 +1062,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) throw(SQLException, RuntimeExc return false; } -void SAL_CALL OEvoabResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1071,14 +1071,14 @@ void SAL_CALL OEvoabResultSet::refreshRow( ) throw(SQLException, RuntimeExcepti // XCancellable -void SAL_CALL OEvoabResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } //XCloseable -void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1089,18 +1089,18 @@ void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException, s // XWarningsSupplier -void SAL_CALL OEvoabResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::clearWarnings( ) { m_aWarnings.clearWarnings(); } -Any SAL_CALL OEvoabResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OEvoabResultSet::getWarnings( ) { return m_aWarnings.getWarnings(); } //XColumnLocate Interface -sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1147,7 +1147,7 @@ void SAL_CALL OEvoabResultSet::release() throw() } css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL -OEvoabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +OEvoabResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 422ef5ac7ee5..6d506dc238e9 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -131,64 +131,64 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 4f742a625899..8e0fda36dcbc 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -39,7 +39,7 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData() { } -void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException) +void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) { OSQLColumns::Vector::const_iterator aIter; static const char aName[] = "Name"; @@ -64,45 +64,45 @@ void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity } -sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnDisplaySize( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnDisplaySize( sal_Int32 /*nColumnNum*/ ) { return 50; } -sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum ) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; return evoab::getFieldType (nField); } -sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnCount( ) { return m_aEvoabFields.size(); } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnNum*/ ) { return true; } -OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) { return OUString(); } -OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; return evoab::getFieldName( nField ); } -OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; return evoab::getFieldTypeName( nField ); } -OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; const ColumnProperty *pSpecs = getField(nField); @@ -115,68 +115,68 @@ OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum return aLabel; } -OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) { return OUString(); } -OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) { return m_aTableName;//OUString("TABLE"); } -OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) { return OUString(); } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isCurrency( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isCurrency( sal_Int32 /*nColumnNum*/ ) { return false; } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isAutoIncrement( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isAutoIncrement( sal_Int32 /*nColumnNum*/ ) { return false; } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isSigned( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isSigned( sal_Int32 /*nColumnNum*/ ) { return false; } -sal_Int32 SAL_CALL OEvoabResultSetMetaData::getPrecision( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSetMetaData::getPrecision( sal_Int32 /*nColumnNum*/ ) { return 0; } -sal_Int32 SAL_CALL OEvoabResultSetMetaData::getScale( sal_Int32 /*nColumnNum*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSetMetaData::getScale( sal_Int32 /*nColumnNum*/ ) { return 0; } -sal_Int32 SAL_CALL OEvoabResultSetMetaData::isNullable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSetMetaData::isNullable( sal_Int32 /*nColumnNum*/ ) { return 0; } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isSearchable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isSearchable( sal_Int32 /*nColumnNum*/ ) { return true; } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isReadOnly( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isReadOnly( sal_Int32 /*nColumnNum*/ ) { return true; } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isDefinitelyWritable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isDefinitelyWritable( sal_Int32 /*nColumnNum*/ ) { return false; } -sal_Bool SAL_CALL OEvoabResultSetMetaData::isWritable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSetMetaData::isWritable( sal_Int32 /*nColumnNum*/ ) { return false; } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index eca3a00bcc2d..12accaf71d3e 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -44,7 +44,7 @@ namespace connectivity public: explicit OEvoabResultSetMetaData(const OUString& _aTableName); /// @throws css::sdbc::SQLException - void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException); + void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } inline sal_Int32 getFieldSize() const @@ -53,27 +53,27 @@ namespace connectivity inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 4cad191ccaa5..386952c0a265 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -135,7 +135,7 @@ void OCommonStatement::disposing() OCommonStatement_IBase::disposing(); } -Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement_IBase::queryInterface(rType); if(!aRet.hasValue()) @@ -143,7 +143,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim return aRet; } -Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), @@ -161,7 +161,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, //} -void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -490,7 +490,7 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData } -Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -500,7 +500,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLExcepti } -Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -510,7 +510,7 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -590,7 +590,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUStrin } -Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -608,7 +608,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OCommonStatement, OStatement_IBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase ) -sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -618,7 +618,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException } -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -627,7 +627,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql } -sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index efdc5f2f124e..c5cc7ef510e0 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -211,19 +211,19 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; protected: /** will return the EBookQuery representing the statement WHERE condition, or throw @@ -262,7 +262,7 @@ namespace connectivity } // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -273,10 +273,10 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override ; }; } } diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 163b721eb7ff..587cdc632b05 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -75,7 +75,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName) return xRet; } -void OEvoabTables::impl_refresh( ) throw(RuntimeException) +void OEvoabTables::impl_refresh( ) { static_cast<OEvoabCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 1977863cb38c..b1acf94daac7 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -30,7 +30,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OEvoabTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index 12dd47a4076c..a5bcd71948c5 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -66,7 +66,7 @@ void OFileCatalog::refreshTables() } -Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) { if( rType == cppu::UnoType<XGroupsSupplier>::get()|| rType == cppu::UnoType<XUsersSupplier>::get()|| @@ -78,7 +78,7 @@ Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeExc return OFileCatalog_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) { typedef sdbcx::OCatalog OFileCatalog_BASE; diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index 2956e5e0fed6..a380dc8e6f5f 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -75,7 +75,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) return xRet; } -void OColumns::impl_refresh() throw(RuntimeException) +void OColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index d77f1b411b29..27d2b2d9ee03 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -94,10 +94,6 @@ bool OConnection::matchesExtension( const OUString& _rExt ) const void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, - css::uno::DeploymentException, - std::exception) { osl_atomic_increment( &m_refCount ); @@ -218,7 +214,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.file.Connection", "com.sun.star.sdbc.Connection") -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -229,7 +225,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -242,18 +238,18 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return pStmt; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) { throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) { return sql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -261,7 +257,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti m_bAutoCommit = autoCommit; } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -269,22 +265,22 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return m_bAutoCommit; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::commit( ) { } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::rollback( ) { } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -300,7 +296,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -309,7 +305,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, m_bReadOnly = readOnly; } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -318,37 +314,37 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_bReadOnly; } -void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) { throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::getCatalog( ) { return OUString(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) { throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { return 0; } -Reference< XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OConnection::getTypeMap( ) { return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) { } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -359,12 +355,12 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std:: } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OConnection::getWarnings( ) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::clearWarnings( ) { } @@ -409,7 +405,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const return xContent; } -sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) throw (RuntimeException, std::exception) +sal_Int64 SAL_CALL OConnection::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/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index e3bc0d7ae89f..05f2fc499154 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -64,7 +64,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/, - const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*columnNamePattern*/ ) { SAL_WARN("connectivity.drivers", "ODatabaseMetaData::getColumns() should be overridden!"); return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns ); @@ -156,7 +156,7 @@ namespace Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception) + const OUString& tableNamePattern, const Sequence< OUString >& types ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -308,47 +308,47 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { return 0; } @@ -358,7 +358,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { return 0; } @@ -369,7 +369,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -437,17 +437,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } @@ -457,17 +457,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } @@ -482,17 +482,17 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { return OUString(); } @@ -502,12 +502,12 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return OUString("\""); } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return true; } @@ -517,57 +517,57 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) { return false; } @@ -577,22 +577,22 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } @@ -607,7 +607,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -617,12 +617,12 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { return false; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -640,137 +640,137 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { return true; } @@ -780,207 +780,207 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { return OUString( "sdbc:file:" ); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) { return OUString::number(1); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { return OUString::number(0); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT"); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW"); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { switch(setType) { @@ -993,7 +993,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 /*concurrency*/ ) { switch(setType) { @@ -1006,57 +1006,57 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { return nullptr; } diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 15432f740523..a0a1427954e9 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -60,12 +60,12 @@ void OFileDriver::disposing() // static ServiceInfo -OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OFileDriver::getImplementationName_Static( ) { return OUString("com.sun.star.sdbc.driver.file.Driver"); } -Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -74,24 +74,24 @@ Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (Run } -OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OFileDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriver_BASE::rBHelper.bDisposed); @@ -105,12 +105,11 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, con } sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:file:"); } -Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { @@ -172,19 +171,19 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL OFileDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OFileDriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) { return 0; } // XDataDefinitionSupplier -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriver_BASE::rBHelper.bDisposed); @@ -211,7 +210,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection } -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) { diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index c59496af98f2..22f3449e4aaf 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -75,7 +75,7 @@ void OPreparedStatement::disposing() } } -void OPreparedStatement::construct(const OUString& sql) throw(SQLException, RuntimeException, std::exception) +void OPreparedStatement::construct(const OUString& sql) { OStatement_Base::construct(sql); @@ -108,7 +108,7 @@ rtl::Reference<OResultSet> OPreparedStatement::makeResultSet() return xResultSet; } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -117,7 +117,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, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(), cppu::UnoType<XParameters>::get(), @@ -127,7 +127,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) t } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -139,7 +139,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::close( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -148,7 +148,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -162,7 +162,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -180,13 +180,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { setParameter(parameterIndex,x); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -195,7 +195,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -204,59 +204,59 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { setParameter(parameterIndex,static_cast<bool>(x)); } -void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) { setParameter(parameterIndex,DBTypeConversion::toDouble(aData)); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) { setParameter(parameterIndex,DBTypeConversion::toDouble(aVal)); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) { setParameter(parameterIndex,DBTypeConversion::toDouble(aVal)); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setLong", *this ); } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkAndResizeParameters(parameterIndex); @@ -268,31 +268,31 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { switch(sqlType) { @@ -307,13 +307,13 @@ 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, std::exception) +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, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -327,25 +327,25 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { setBinaryStream(parameterIndex,x,length ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -356,7 +356,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index fe4341152793..f1ef8644e27d 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -160,13 +160,13 @@ void OResultSet::disposing() m_aSkipDeletedSet.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OResultSet::getTypes( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -178,7 +178,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std:: } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -200,7 +200,6 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ } const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -212,67 +211,67 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex) return *(m_aSelectRow->get())[columnIndex]; } -void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException) +void OResultSet::checkIndex(sal_Int32 columnIndex ) { if ( columnIndex <= 0 || columnIndex >= m_nColumnCount ) ::dbtools::throwInvalidIndexException(*this); } -Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) { return bool(getValue(columnIndex)); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) { return getValue(columnIndex); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) { return getValue(columnIndex); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) { return getValue(columnIndex); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -283,13 +282,13 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) { return getValue(columnIndex); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -300,57 +299,57 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) { return getValue(columnIndex); } -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -359,7 +358,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return m_nRowPos == sal_Int32(m_pFileSet->get().size()); } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -368,7 +367,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, return m_nRowPos == 0; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -377,7 +376,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s return m_nRowPos == sal_Int32(m_pFileSet->get().size() - 1); } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -387,7 +386,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -399,13 +398,13 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st } -void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::close( ) { dispose(); } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -413,7 +412,7 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, st } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::last( ) { // here I know definitely that I stand on the last record ::osl::MutexGuard aGuard( m_aMutex ); @@ -421,28 +420,28 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,true); } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE1,row,true); } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE1,row,true); } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,true); } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -452,7 +451,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -461,7 +460,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio return m_bRowDeleted; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -469,7 +468,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return m_bRowInserted; } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -479,7 +478,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -488,7 +487,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep return m_nRowPos == -1; } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -497,7 +496,7 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -506,20 +505,20 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OResultSet::cancel( ) { } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::clearWarnings( ) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getWarnings( ) { return Any(); } -void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::insertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -543,7 +542,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st } } -void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -557,7 +556,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, st clearInsertRow(); } -void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::deleteRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -579,7 +578,7 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std: } } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::cancelRowUpdates( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -602,7 +601,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToInsertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -621,11 +620,11 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToCurrentRow( ) { } -void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException) +void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -638,79 +637,79 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) { ORowSetValue aEmpty; updateValue(columnIndex,aEmpty); } -void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex, static_cast<bool>(x)); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -723,25 +722,25 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { updateBinaryStream(columnIndex,x,length); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); @@ -1420,7 +1419,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -1555,7 +1554,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -1615,7 +1614,7 @@ bool OResultSet::isRowDeleted() const return m_aRow->isDeleted(); } -void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) +void SAL_CALL OResultSet::disposing( const EventObject& Source ) { Reference<XPropertySet> xProp = m_pTable.get(); if(m_pTable.is() && Source.Source == xProp) diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index d1c612d50e70..070cd4492bc1 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -49,44 +49,44 @@ OResultSetMetaData::~OResultSetMetaData() m_xColumns = nullptr; } -void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException) +void OResultSetMetaData::checkColumnIndex(sal_Int32 column) { if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size()) throwInvalidIndexException(*this); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { return getPrecision(column); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { return (m_xColumns->get()).size(); } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) { return false; } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { checkColumnIndex(column); @@ -94,77 +94,77 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); } -OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) { return m_aTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } -OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex(column); return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) { return false; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) { return true; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) { return true; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { checkColumnIndex(column); return m_pTable->isReadOnly() || ( @@ -173,12 +173,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return !isReadOnly(column); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return !isReadOnly(column); } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 0bd256484117..6d91496c378f 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -143,13 +143,13 @@ void SAL_CALL OStatement_BASE2::release() throw() release_ChildImpl(); } -Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) { const Any aRet = OStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -159,11 +159,11 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, } -void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OStatement_Base::cancel( ) { } -void SAL_CALL OStatement_Base::close() throw (SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement_Base::close() { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -172,7 +172,7 @@ void SAL_CALL OStatement_Base::close() throw (SQLException, RuntimeException, st dispose(); } -void OStatement_Base::closeResultSet() throw (SQLException, RuntimeException, std::exception) +void OStatement_Base::closeResultSet() { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::clearMyResultSet " ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ void OStatement_Base::closeResultSet() throw (SQLException, RuntimeException, st m_xResultSet.clear(); } -Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OStatement_Base::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -200,7 +200,7 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti return makeAny(m_aLastWarning); } -void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement_Base::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -239,7 +239,7 @@ void SAL_CALL OStatement::release() throw() } -sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -249,7 +249,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, } -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -266,12 +266,12 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) return xRS; } -Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OStatement::getConnection( ) { return Reference< XConnection >(m_pConnection.get()); } -sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -297,12 +297,12 @@ void SAL_CALL OStatement_Base::disposing() OStatement_BASE::disposing(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_XStatement::queryInterface( rType); return aRet.hasValue() ? aRet : OStatement_BASE2::queryInterface( rType); @@ -369,7 +369,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? TAscendingOrder::DESC : TAscendingOrder::ASC); } -void OStatement_Base::construct(const OUString& sql) throw(SQLException, RuntimeException, std::exception) +void OStatement_Base::construct(const OUString& sql) { OUString aErr; m_pParseTree = m_aParser.parseTree(aErr,sql); diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 88ffe4fe7e84..d97707183cac 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -103,7 +103,7 @@ void OFileTable::refreshIndexes() { } -Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFileTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType<XKeysSupplier>::get()|| rType == cppu::UnoType<XRename>::get()|| @@ -141,7 +141,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OFileTable::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/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index d1402b2c3cd9..4858817601d9 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -40,7 +40,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/) return sdbcx::ObjectType(); } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast<OFileCatalog&>(m_rParent).refreshTables(); } @@ -51,7 +51,7 @@ m_xMetaData.clear(); OCollection::disposing(); } -Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OTables::queryInterface( const Type & rType ) { if( rType == cppu::UnoType<XColumnLocate>::get()|| rType == cppu::UnoType<XDataDescriptorFactory>::get()|| diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 018b57e4596f..befd56103e32 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -221,7 +221,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) } -void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree"); @@ -267,7 +267,7 @@ void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) throw(S } -void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree"); const OSQLParseNode* pPart2 = pPredicateNode->getChild(1); @@ -315,7 +315,7 @@ void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLEx m_aCodeList.push_back(pOperator); } -void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception) +void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree"); @@ -392,7 +392,7 @@ void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQ m_aCodeList.push_back(pBoolOp); } -void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree"); const OSQLParseNode* pPart2 = pPredicateNode->getChild(1); @@ -410,7 +410,7 @@ void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQL m_aCodeList.push_back(pOperator); } -OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception) +OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) { OOperand* pOperand = nullptr; @@ -589,7 +589,7 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD delete pOperand; } -void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree"); @@ -605,7 +605,7 @@ void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) throw(SQL m_aCodeList.push_back(pOperator); } -void OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) { OOperator* pOperator = nullptr; diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index 2c6b95261c31..0677388f1610 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -45,7 +45,6 @@ Blob::Blob(isc_db_handle* pDatabaseHandle, } void Blob::ensureBlobIsOpened() - throw(SQLException) { MutexGuard aGuard(m_aMutex); @@ -94,7 +93,6 @@ void Blob::ensureBlobIsOpened() } void Blob::closeBlob() - throw (SQLException) { MutexGuard aGuard(m_aMutex); @@ -132,7 +130,6 @@ void SAL_CALL Blob::disposing() } sal_Int64 SAL_CALL Blob::length() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -143,7 +140,6 @@ sal_Int64 SAL_CALL Blob::length() uno::Sequence< sal_Int8 > SAL_CALL Blob::getBytes(sal_Int64 nPosition, sal_Int32 nBytes) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -172,14 +168,12 @@ uno::Sequence< sal_Int8 > SAL_CALL Blob::getBytes(sal_Int64 nPosition, } uno::Reference< XInputStream > SAL_CALL Blob::getBinaryStream() - throw(SQLException, RuntimeException, std::exception) { return this; } sal_Int64 SAL_CALL Blob::position(const uno::Sequence< sal_Int8 >& /*rPattern*/, sal_Int64 /*nStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Blob::position", *this); return 0; @@ -187,7 +181,6 @@ sal_Int64 SAL_CALL Blob::position(const uno::Sequence< sal_Int8 >& /*rPattern*/ sal_Int64 SAL_CALL Blob::positionOfBlob(const uno::Reference< XBlob >& /*rPattern*/, sal_Int64 /*aStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Blob::positionOfBlob", *this); return 0; @@ -197,7 +190,6 @@ sal_Int64 SAL_CALL Blob::positionOfBlob(const uno::Reference< XBlob >& /*rPatte sal_Int32 SAL_CALL Blob::readBytes(uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 nBytes) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -263,7 +255,6 @@ sal_Int32 SAL_CALL Blob::readBytes(uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 SAL_CALL Blob::readSomeBytes(uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 nMaximumBytes) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { // We don't have any way of verifying how many bytes are immediately available, // hence we just pass through direct to readBytes @@ -272,7 +263,6 @@ sal_Int32 SAL_CALL Blob::readSomeBytes(uno::Sequence< sal_Int8 >& rDataOut, } void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { // There is no way of directly skipping, hence we have to pretend to skip // by reading & discarding the data. @@ -281,7 +271,6 @@ void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip) } sal_Int32 SAL_CALL Blob::available() - throw (NotConnectedException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -314,7 +303,6 @@ sal_Int32 SAL_CALL Blob::available() } void SAL_CALL Blob::closeInput() - throw(NotConnectedException, IOException, RuntimeException, std::exception) { try { diff --git a/connectivity/source/drivers/firebird/Blob.hxx b/connectivity/source/drivers/firebird/Blob.hxx index c8fd8c79e6f7..eb8e282bf911 100644 --- a/connectivity/source/drivers/firebird/Blob.hxx +++ b/connectivity/source/drivers/firebird/Blob.hxx @@ -46,16 +46,14 @@ namespace connectivity ISC_STATUS_ARRAY m_statusVector; /// @throws css::sdbc::SQLException - void ensureBlobIsOpened() - throw(css::sdbc::SQLException); + void ensureBlobIsOpened(); /** * Closes the blob and cleans up resources -- can be used to reset * the blob if we e.g. want to read from the beginning again. * * @throws css::sdbc::SQLException */ - void closeBlob() - throw(css::sdbc::SQLException); + void closeBlob(); public: Blob(isc_db_handle* pDatabaseHandle, @@ -64,59 +62,31 @@ namespace connectivity // ---- XBlob ---------------------------------------------------- virtual sal_Int64 SAL_CALL - length() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + length() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes(sal_Int64 aPosition, sal_Int32 aLength) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBytes(sal_Int64 aPosition, sal_Int32 aLength) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBinaryStream() override; virtual sal_Int64 SAL_CALL position(const css::uno::Sequence< sal_Int8 >& rPattern, - sal_Int64 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int64 aStart) override; virtual sal_Int64 SAL_CALL positionOfBlob(const css::uno::Reference< css::sdbc::XBlob >& rPattern, - sal_Int64 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int64 aStart) override; // ---- XInputStream ---------------------------------------------- virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& rDataOut, - sal_Int32 nBytes) - throw(css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nBytes) override; virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& rDataOut, - sal_Int32 nMaximumBytes) - throw(css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nMaximumBytes) override; virtual void SAL_CALL - skipBytes(sal_Int32 nBytes) - throw(css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + skipBytes(sal_Int32 nBytes) override; virtual sal_Int32 SAL_CALL - available() - throw(css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + available() override; virtual void SAL_CALL - closeInput() - throw(css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + closeInput() override; // ---- OComponentHelper ------------------------------------------ virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/firebird/Clob.cxx b/connectivity/source/drivers/firebird/Clob.cxx index 83d95797d4d9..4f70a000a242 100644 --- a/connectivity/source/drivers/firebird/Clob.cxx +++ b/connectivity/source/drivers/firebird/Clob.cxx @@ -40,7 +40,6 @@ void SAL_CALL Clob::disposing() } sal_Int64 SAL_CALL Clob::length() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Clob_BASE::rBHelper.bDisposed); @@ -56,7 +55,6 @@ sal_Int64 SAL_CALL Clob::length() OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition, sal_Int32 nLength) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Clob_BASE::rBHelper.bDisposed); @@ -76,7 +74,6 @@ OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition, } uno::Reference< XInputStream > SAL_CALL Clob::getCharacterStream() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Clob_BASE::rBHelper.bDisposed); @@ -86,7 +83,6 @@ uno::Reference< XInputStream > SAL_CALL Clob::getCharacterStream() sal_Int64 SAL_CALL Clob::position(const OUString& /*rPattern*/, sal_Int32 /*nStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Clob::position", *this); return 0; @@ -94,7 +90,6 @@ sal_Int64 SAL_CALL Clob::position(const OUString& /*rPattern*/, sal_Int64 SAL_CALL Clob::positionOfClob(const Reference <XClob >& /*rPattern*/, sal_Int64 /*aStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Blob::positionOfBlob", *this); return 0; diff --git a/connectivity/source/drivers/firebird/Clob.hxx b/connectivity/source/drivers/firebird/Clob.hxx index dfa40dedd484..b71bec19fa51 100644 --- a/connectivity/source/drivers/firebird/Clob.hxx +++ b/connectivity/source/drivers/firebird/Clob.hxx @@ -45,27 +45,17 @@ namespace connectivity // ---- XClob ---------------------------------------------------- virtual sal_Int64 SAL_CALL - length() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + length() override; virtual ::rtl::OUString SAL_CALL - getSubString(sal_Int64 aPosition, sal_Int32 aLength) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getSubString(sal_Int64 aPosition, sal_Int32 aLength) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getCharacterStream() override; virtual sal_Int64 SAL_CALL position(const ::rtl::OUString& rPattern, - sal_Int32 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 aStart) override; virtual sal_Int64 SAL_CALL positionOfClob(const ::css::uno::Reference< ::css::sdbc::XClob >& rPattern, - sal_Int64 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int64 aStart) override; // ---- OComponentHelper ------------------------------------------ virtual void SAL_CALL disposing() override; }; diff --git a/connectivity/source/drivers/firebird/Column.cxx b/connectivity/source/drivers/firebird/Column.cxx index 38c367cfcc43..78ea2534e1fc 100644 --- a/connectivity/source/drivers/firebird/Column.cxx +++ b/connectivity/source/drivers/firebird/Column.cxx @@ -45,7 +45,7 @@ void Column::construct() return *Column_PROP::getArrayHelper(isNew() ? 1 : 0); } -css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames( ) { css::uno::Sequence< OUString > aSupported { "com.sun.star.sdbc.Firebird" }; diff --git a/connectivity/source/drivers/firebird/Column.hxx b/connectivity/source/drivers/firebird/Column.hxx index 0b1ea67c1544..33d49516b6d7 100644 --- a/connectivity/source/drivers/firebird/Column.hxx +++ b/connectivity/source/drivers/firebird/Column.hxx @@ -28,7 +28,7 @@ namespace connectivity public: Column(); virtual void construct() override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; } } diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 54ee5efdd7c9..7c39219943ee 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -145,7 +145,6 @@ struct ConnectionGuard }; void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) - throw (SQLException, RuntimeException, std::exception) { ConnectionGuard aGuard(m_refCount); @@ -360,7 +359,6 @@ IMPLEMENT_SERVICE_INFO(Connection, "com.sun.star.sdbc.drivers.firebird.Connectio "com.sun.star.sdbc.Connection") Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId) - throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -374,7 +372,6 @@ Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId) } Reference< XClob> Connection::createClob(ISC_QUAD* pBlobId) - throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -390,7 +387,6 @@ Reference< XClob> Connection::createClob(ISC_QUAD* pBlobId) //----- XConnection ---------------------------------------------------------- Reference< XStatement > SAL_CALL Connection::createStatement( ) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -432,7 +428,6 @@ OUString Connection::transformPreparedStatement(const OUString& _sSQL) Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement( const OUString& _sSql) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "prepareStatement() " "called with sql: " << _sSql); @@ -452,7 +447,7 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement( } Reference< XPreparedStatement > SAL_CALL Connection::prepareCall( - const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) + const OUString& _sSql ) { SAL_INFO("connectivity.firebird", "prepareCall(). " "_sSql: " << _sSql); @@ -467,7 +462,6 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareCall( } OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql ) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); // We do not need to adapt the SQL for Firebird atm. @@ -475,7 +469,6 @@ OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql ) } void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit ) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -488,7 +481,7 @@ void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit ) } } -sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL Connection::getAutoCommit() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -497,7 +490,6 @@ sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeExcepti } void Connection::setupTransaction() - throw (SQLException) { MutexGuard aGuard( m_aMutex ); ISC_STATUS status_vector[20]; @@ -555,7 +547,6 @@ void Connection::setupTransaction() } isc_tr_handle& Connection::getTransaction() - throw (SQLException) { MutexGuard aGuard( m_aMutex ); if (!m_aTransactionHandle) @@ -565,7 +556,7 @@ isc_tr_handle& Connection::getTransaction() return m_aTransactionHandle; } -void SAL_CALL Connection::commit() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::commit() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -720,7 +711,7 @@ void Connection::runBackupService(const short nAction) } -void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::rollback() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -733,7 +724,7 @@ void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException, std:: } } -sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL Connection::isClosed( ) { MutexGuard aGuard( m_aMutex ); @@ -741,7 +732,7 @@ sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException, return Connection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -759,7 +750,6 @@ Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) throw(SQLExc } void SAL_CALL Connection::setReadOnly(sal_Bool readOnly) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -768,7 +758,7 @@ void SAL_CALL Connection::setReadOnly(sal_Bool readOnly) setupTransaction(); } -sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL Connection::isReadOnly() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -777,19 +767,17 @@ sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException, } void SAL_CALL Connection::setCatalog(const OUString& /*catalog*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("setCatalog", *this); } OUString SAL_CALL Connection::getCatalog() - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("getCatalog", *this); return OUString(); } -void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -798,7 +786,7 @@ void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLEx setupTransaction(); } -sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -806,21 +794,20 @@ sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) throw(SQLException, R return m_aTransactionIsolation; } -Reference< XNameAccess > SAL_CALL Connection::getTypeMap() throw(SQLException, RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL Connection::getTypeMap() { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::getTypeMap", *this ); return nullptr; } void SAL_CALL Connection::setTypeMap(const Reference< XNameAccess >& typeMap) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); (void) typeMap; } //----- XCloseable ----------------------------------------------------------- -void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::close( ) { // we just dispose us { @@ -832,20 +819,19 @@ void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException, std::e } // XWarningsSupplier -Any SAL_CALL Connection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL Connection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL Connection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::clearWarnings( ) { // you should clear your collected warnings here } // XDocumentEventListener void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event ) - throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -899,14 +885,13 @@ void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event ) } // XEventListener void SAL_CALL Connection::disposing(const EventObject& /*rSource*/) - throw (RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); m_xEmbeddedStorage.clear(); } -void Connection::buildTypeInfo() throw( SQLException) +void Connection::buildTypeInfo() { MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 9e8d917c4393..6c6df60beffd 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -157,8 +157,7 @@ namespace connectivity OWeakRefArray m_aStatements; /// @throws css::sdbc::SQLException - void buildTypeInfo() - throw (css::sdbc::SQLException); + void buildTypeInfo(); /** * Creates a new transaction with the desired parameters, if @@ -167,8 +166,7 @@ namespace connectivity * * @throws css::sdbc::SQLException */ - void setupTransaction() - throw(css::sdbc::SQLException); + void setupTransaction(); void disposeStatements(); /** transform named parameters into unnamed parameters @@ -186,17 +184,13 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException void construct( const ::rtl::OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception); + const css::uno::Sequence< css::beans::PropertyValue >& info); const OUString& getConnectionURL() const {return m_sConnectionURL;} bool isEmbedded() const {return m_bIsEmbedded;} isc_db_handle& getDBHandle() {return m_aDBHandle;} /// @throws css::sdbc::SQLException - isc_tr_handle& getTransaction() - throw(css::sdbc::SQLException); + isc_tr_handle& getTransaction(); /** * Must be called anytime the underlying database is likely to have @@ -217,15 +211,11 @@ namespace connectivity * @throws css::uno::RuntimeException */ css::uno::Reference< css::sdbc::XBlob> - createBlob(ISC_QUAD* pBlobID) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + createBlob(ISC_QUAD* pBlobID); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException css::uno::Reference< css::sdbc::XClob> - createClob(ISC_QUAD* pBlobID) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + createClob(ISC_QUAD* pBlobID); /** * Create and/or connect to the sdbcx Catalog. This is completely @@ -242,33 +232,33 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) override; + virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) override; + virtual ::rtl::OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) override; // css.lang.XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; } diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index f774438e6335..66d9783ba9cd 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -55,103 +55,95 @@ ODatabaseMetaData::~ODatabaseMetaData() } //----- Catalog Info -- UNSUPPORTED ------------------------------------------- -OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() { return -1; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() { OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCatalogs); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() { return false; } //----- Schema Info -- UNSUPPORTED -------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength() - throw(SQLException, RuntimeException, std::exception) { return -1; } OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() - throw(SQLException, RuntimeException, std::exception) { return OUString(); } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() - throw(SQLException, RuntimeException, std::exception) { OSL_FAIL("Not implemented yet!"); // TODO implement @@ -159,68 +151,68 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() } //----- Max Sizes/Lengths ----------------------------------------------------- -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() { return 31; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() { // TODO: No idea. // See: http://www.firebirdsql.org/en/firebird-technical-specifications/ return 16; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() { return 32; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() { return 100; // Arbitrary } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() { // May however be smaller. // See: http://www.firebirdsql.org/en/firebird-technical-specifications/ return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() { return 31; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } @@ -228,25 +220,22 @@ sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLExc // ---- Identifiers ----------------------------------------------------------- // Only quoted identifiers are case sensitive, unquoted are case insensitive OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() - throw(SQLException, RuntimeException, std::exception) { OUString aVal('"'); return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { // TODO: confirm this -- the documentation is highly ambiguous // However it seems this should be true as quoted identifiers ARE @@ -255,7 +244,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } @@ -263,80 +251,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() // ---- Unquoted Identifiers ------------------------------------------------- // All unquoted identifiers are stored upper case. sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return true; } // ---- SQL Feature Support --------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() - throw(SQLException, RuntimeException, std::exception) { // TODO: true if embedded, but unsure about remote server return true; @@ -344,7 +319,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType, sal_Int32 toType) - throw(SQLException, RuntimeException, std::exception) { (void) fromType; (void) toType; @@ -352,109 +326,95 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType, } sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames() - throw(SQLException, RuntimeException, std::exception) { return true; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return true; } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } // ---- Data definition stuff ------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData:: supportsDataDefinitionAndDataManipulationTransactions() - throw(SQLException, RuntimeException, std::exception) { return false; } //----- Transaction Support -------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 aLevel) - throw(SQLException, RuntimeException, std::exception) { return aLevel == TransactionIsolation::READ_UNCOMMITTED || aLevel == TransactionIsolation::READ_COMMITTED @@ -463,290 +423,288 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( } sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() - throw(SQLException, RuntimeException, std::exception) { return TransactionIsolation::REPEATABLE_READ; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return true; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 31; // TODO: confirm return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return m_pConnection->isEmbedded(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { // Unsure return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { // Unsure return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getURL() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL() { return m_pConnection->getConnectionURL(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { return 31; } sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { switch (setType) { @@ -760,7 +718,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 aResultSetType, sal_Int32 aConcurrency) - throw(SQLException, RuntimeException, std::exception) { if (aResultSetType == ResultSetType::FORWARD_ONLY && aConcurrency == ResultSetConcurrency::READ_ONLY) @@ -769,69 +726,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) { (void) setType; return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates() - throw(SQLException, RuntimeException, std::exception) { // No batch support in firebird return false; } uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() - throw(SQLException, RuntimeException, std::exception) { return uno::Reference<XConnection>(m_pConnection.get()); } @@ -841,7 +796,7 @@ uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() // of course you could implement it on your and you should do this because // the general way is more memory expensive -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); @@ -869,7 +824,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTypeInfo()"); @@ -1077,7 +1031,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const OUString& /*sSchema*/, const OUString& sTable, const OUString& sColumnNamePattern) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getColumnPrivileges() with " "Table: " << sTable @@ -1153,7 +1106,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const OUString& columnNamePattern) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getColumns() with " "TableNamePattern: " << tableNamePattern << @@ -1343,7 +1295,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTables() with " "TableNamePattern: " << tableNamePattern); @@ -1468,7 +1419,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1482,7 +1433,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1494,7 +1445,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1506,7 +1457,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { // List the columns in a table which are foreign keys. This is actually // never used anywhere in the LO codebase currently. Retrieval from firebird @@ -1521,7 +1472,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { (void) catalog; (void) schema; @@ -1613,7 +1564,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( const Any& /*aCatalog*/, const OUString& /*sSchema*/, const OUString& sTable) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getPrimaryKeys() with " "Table: " << sTable); @@ -1676,7 +1626,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const OUString& sTable, sal_Bool bIsUnique, sal_Bool bIsApproximate) - throw(SQLException, RuntimeException, std::exception) { // Apparently this method can also return a "tableIndexStatistic" // However this is only mentioned in XDatabaseMetaData.idl (whose comments @@ -1766,7 +1715,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) + sal_Bool nullable ) { (void) catalog; (void) schema; @@ -1782,7 +1731,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& /*aCatalog*/, const OUString& /*sSchemaPattern*/, const OUString& sTableNamePattern) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTablePrivileges() with " "TableNamePattern: " << sTableNamePattern); @@ -1849,7 +1797,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( uno::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, std::exception) + const OUString& foreignSchema, const OUString& foreignTable ) { (void) primaryCatalog; (void) primarySchema; @@ -1862,7 +1810,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCrossReference); } -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) { (void) catalog; (void) schemaPattern; diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index fc9b1cfdb037..aeb7acab00d9 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -45,155 +45,155 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual ::rtl::OUString SAL_CALL getURL( ) override; + virtual ::rtl::OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) override; + virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual ::rtl::OUString SAL_CALL getDriverName( ) override; + virtual ::rtl::OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) override; + virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getStringFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) override; + virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) override; + virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) override; + virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index ff63fbe114ea..9fe66357e010 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -49,7 +49,7 @@ namespace connectivity namespace firebird { Reference< XInterface > SAL_CALL FirebirdDriver_CreateInstance( - const Reference< XMultiServiceFactory >& _rxFactory) throw( Exception, std::exception ) + const Reference< XMultiServiceFactory >& _rxFactory) { SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" ); return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory))); @@ -143,12 +143,12 @@ void FirebirdDriver::disposing() } //----- static ServiceInfo --------------------------------------------------- -rtl::OUString FirebirdDriver::getImplementationName_Static() throw(RuntimeException) +rtl::OUString FirebirdDriver::getImplementationName_Static() { return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver"); } -Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (RuntimeException) +Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -156,19 +156,17 @@ Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (Ru return aSNS; } -OUString SAL_CALL FirebirdDriver::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL FirebirdDriver::getImplementationName() { return getImplementationName_Static(); } sal_Bool SAL_CALL FirebirdDriver::supportsService(const OUString& _rServiceName) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames() - throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -176,7 +174,6 @@ Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames() // ---- XDriver ------------------------------------------------------------- Reference< XConnection > SAL_CALL FirebirdDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) - throw(SQLException, RuntimeException, std::exception) { Reference< XConnection > xConnection; @@ -202,7 +199,6 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect( } sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { SvtMiscOptions aMiscOptions; @@ -212,7 +208,6 @@ sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url ) Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) - throw(SQLException, RuntimeException, std::exception) { (void) info; if ( ! acceptsURL(url) ) @@ -225,14 +220,14 @@ Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( ) { // The major and minor version are sdbc driver specific. Must begin with 1.0 // as per http://api.libreoffice.org/docs/common/ref/com/sun/star/sdbc/XDriver.html return 1; } -sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) { return 0; } @@ -240,7 +235,6 @@ sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) throw(RuntimeException, s //----- XDataDefinitionSupplier uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByConnection( const uno::Reference< XConnection >& rConnection) - throw(SQLException, RuntimeException, std::exception) { Connection* pConnection = static_cast< Connection* >(rConnection.get()); return uno::Reference< XTablesSupplier >(pConnection->createCatalog(), UNO_QUERY); @@ -249,7 +243,6 @@ uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByCo uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByURL( const OUString& rURL, const uno::Sequence< PropertyValue >& rInfo) - throw(SQLException, RuntimeException, std::exception) { uno::Reference< XConnection > xConnection = connect(rURL, rInfo); return getDataDefinitionByConnection(xConnection); @@ -295,7 +288,7 @@ namespace connectivity osl_atomic_increment( &_refCount ); } - void checkDisposed(bool _bThrow) throw ( DisposedException ) + void checkDisposed(bool _bThrow) { if (_bThrow) throw DisposedException(); diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index a48b13e11f53..c314fc69fe4f 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -39,7 +39,7 @@ namespace connectivity static const int FIREBIRD_SQL_DIALECT = 3; /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception, std::exception ); + css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, css::sdbcx::XDataDefinitionSupplier, @@ -68,34 +68,30 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface /// @throws css::uno::RuntimeException - static ::rtl::OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static ::rtl::OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; // XDataDefinitionSupplier virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( - const css::uno::Reference< css::sdbc::XConnection >& rxConnection) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XConnection >& rxConnection) override; virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& rsURL, - const css::uno::Sequence< css::beans::PropertyValue >& rInfo) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rInfo) override; }; } diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index b427c5fe358c..970c24c2d924 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -63,7 +63,6 @@ OPreparedStatement::OPreparedStatement( Connection* _pConnection, } void OPreparedStatement::ensurePrepared() - throw (SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -128,7 +127,6 @@ void SAL_CALL OPreparedStatement::release() throw() } Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType) - throw(RuntimeException, std::exception) { Any aRet = OStatementCommonBase::queryInterface(rType); if(!aRet.hasValue()) @@ -137,14 +135,12 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType) } uno::Sequence< Type > SAL_CALL OPreparedStatement::getTypes() - throw(RuntimeException, std::exception) { return concatSequences(OPreparedStatement_Base::getTypes(), OStatementCommonBase::getTypes()); } Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -157,7 +153,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() return m_xMetaData; } -void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::close() { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -184,7 +180,6 @@ void SAL_CALL OPreparedStatement::disposing() void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex, const OUString& x) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "setString(" << nParameterIndex << " , " << x << ")"); @@ -234,7 +229,6 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex, } Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -243,7 +237,6 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() } sal_Bool SAL_CALL OPreparedStatement::execute() - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "executeQuery(). " "Got called with sql: " << m_sSqlStatement); @@ -296,14 +289,12 @@ sal_Bool SAL_CALL OPreparedStatement::execute() } sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() - throw(SQLException, RuntimeException, std::exception) { execute(); return getStatementChangeCount(); } Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery() - throw(SQLException, RuntimeException, std::exception) { execute(); return m_xResultSet; @@ -346,7 +337,6 @@ sal_Int64 toNumericWithoutDecimalPlace(const OUString& sSource) //----- XParameters ----------------------------------------------------------- void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType*/) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -356,14 +346,12 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType } void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 nIndex, sal_Bool bValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Bool >(nIndex, bValue, SQL_BOOLEAN); } template <typename T> void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) - throw(SQLException, RuntimeException) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -386,43 +374,36 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) } void SAL_CALL OPreparedStatement::setByte(sal_Int32 /*nIndex*/, sal_Int8 /*nValue*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("XParameters::setByte", *this); } void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Int16 >(nIndex, nValue, SQL_SHORT); } void SAL_CALL OPreparedStatement::setInt(sal_Int32 nIndex, sal_Int32 nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Int32 >(nIndex, nValue, SQL_LONG); } void SAL_CALL OPreparedStatement::setLong(sal_Int32 nIndex, sal_Int64 nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Int64 >(nIndex, nValue, SQL_INT64); } void SAL_CALL OPreparedStatement::setFloat(sal_Int32 nIndex, float nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< float >(nIndex, nValue, SQL_FLOAT); } void SAL_CALL OPreparedStatement::setDouble(sal_Int32 nIndex, double nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< double >(nIndex, nValue, SQL_DOUBLE); // TODO: SQL_D_FLOAT? } void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate) - throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_mday = rDate.Day; @@ -436,7 +417,6 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate) } void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const css::util::Time& rTime) - throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_sec = rTime.Seconds; @@ -450,7 +430,6 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const css::util::Ti } void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 nIndex, const DateTime& rTimestamp) - throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_sec = rTimestamp.Seconds; @@ -504,7 +483,7 @@ void OPreparedStatement::closeBlobAfterWriting(isc_blob_handle& rBlobHandle) } } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) { (void) parameterIndex; (void) x; @@ -515,7 +494,6 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, const Reference< XBlob >& xBlob) - throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -565,7 +543,7 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) { (void) parameterIndex; (void) x; @@ -575,7 +553,7 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) { (void) parameterIndex; (void) x; @@ -585,7 +563,7 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -669,7 +647,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) { (void) parameterIndex; (void) sqlType; @@ -680,7 +658,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { (void) parameterIndex; (void) x; @@ -691,7 +669,6 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, const Sequence< sal_Int8 >& xBytes) - throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -738,7 +715,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { (void) parameterIndex; (void) x; @@ -749,7 +726,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { (void) parameterIndex; (void) x; @@ -760,31 +737,28 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { } // ---- Batch methods -- unsupported ----------------------------------------- void SAL_CALL OPreparedStatement::clearBatch() - throw(SQLException, RuntimeException, std::exception) { // Unsupported } void SAL_CALL OPreparedStatement::addBatch() - throw(SQLException, RuntimeException, std::exception) { // Unsupported by firebird } Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch() - throw(SQLException, RuntimeException, std::exception) { // Unsupported by firebird return Sequence< sal_Int32 >(); } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -802,7 +776,6 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons } void OPreparedStatement::checkParameterIndex(sal_Int32 nParameterIndex) - throw(SQLException, RuntimeException) { ensurePrepared(); if ((nParameterIndex == 0) || (nParameterIndex > m_pInSqlda->sqld)) diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index 0062110899dd..986752cd66c1 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -55,9 +55,7 @@ namespace connectivity XSQLDA* m_pInSqlda; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkParameterIndex(sal_Int32 nParameterIndex) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + void checkParameterIndex(sal_Int32 nParameterIndex); /** * Set a numeric value in the input SQLDA. If the destination @@ -66,16 +64,12 @@ namespace connectivity * @throws css::sdbc::SQLException * @throws css::uno::RuntimeException */ - template <typename T> void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + template <typename T> void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType); void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = true); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void ensurePrepared() - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + void ensurePrepared(); /** * Assumes that all necessary mutexes have been taken. */ @@ -87,8 +81,7 @@ namespace connectivity protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual ~OPreparedStatement() override; public: DECLARE_SERVICE_INFO(); @@ -97,90 +90,62 @@ namespace connectivity const ::rtl::OUString& sql); //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPreparedStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - executeQuery() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + executeQuery() override; virtual sal_Int32 SAL_CALL - executeUpdate() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + executeUpdate() override; virtual sal_Bool SAL_CALL - execute() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + execute() override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL - getConnection() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getConnection() override; // XParameters - virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt(sal_Int32 nIndex, sal_Int32 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) override; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) override; + virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) override; + virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) override; + virtual void SAL_CALL setInt(sal_Int32 nIndex, sal_Int32 nValue) override; + virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XPreparedBatchExecution -- UNSUPPORTED by firebird virtual void SAL_CALL - addBatch() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + addBatch() override; virtual void SAL_CALL - clearBatch() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + clearBatch() override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL - executeBatch() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + executeBatch() override; // XCloseable - virtual void SAL_CALL close() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close() override; // OComponentHelper virtual void SAL_CALL disposing() override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; }; } diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index cc9dedc24cc0..4aebf25e810a 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -113,7 +113,7 @@ OResultSet::~OResultSet() } // ---- XResultSet -- Row retrieval methods ------------------------------------ -sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -121,7 +121,7 @@ sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, st return m_currentRow; } -sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::next() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -150,21 +150,21 @@ sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std:: } } -sal_Bool SAL_CALL OResultSet::previous() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::previous() { ::dbtools::throwFunctionNotSupportedSQLException("previous not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::isLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isLast() { ::dbtools::throwFunctionNotSupportedSQLException("isLast not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isBeforeFirst() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -172,7 +172,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeExcepti return m_currentRow == 0; } -sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isAfterLast() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -180,7 +180,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException return m_bIsAfterLastRow; } -sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isFirst() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -188,7 +188,7 @@ sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, st return m_currentRow == 1 && !m_bIsAfterLastRow; } -void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::beforeFirst() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -198,7 +198,7 @@ void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, st *this); } -void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::afterLast() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -208,7 +208,7 @@ void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std: *this); } -sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::first() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -229,7 +229,7 @@ sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std: } } -sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::last() { // We need to iterate past the last row to know when we've passed the last // row, hence we can't actually move to last. @@ -238,7 +238,7 @@ sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException, std:: return false; } -sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -256,7 +256,7 @@ sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, Runti } } -sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -279,7 +279,6 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, Runtim } void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex) - throw (SQLException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -294,7 +293,6 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex) } void SAL_CALL OResultSet::checkRowIndex() - throw (SQLException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -308,19 +306,18 @@ void SAL_CALL OResultSet::checkRowIndex() } } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OResultSet::getTypes() throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OResultSet::getTypes() { return concatSequences(OPropertySetHelper::getTypes(), OResultSet_BASE::getTypes()); } // ---- XColumnLocate --------------------------------------------------------- sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -342,7 +339,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName) return 0; // Never reached } -uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -351,7 +348,7 @@ uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 c return nullptr; } -uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -633,7 +630,7 @@ T OResultSet::safelyRetrieveValue(const sal_Int32 nColumnIndex, const ISC_SHORT } // ---- XRow ----------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::wasNull() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -643,20 +640,17 @@ sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, st // ---- XRow: Simple Numerical types ------------------------------------------ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 nColumnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< bool >(nColumnIndex, SQL_BOOLEAN); } sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 nColumnIndex) - throw(SQLException, RuntimeException, std::exception) { // Not a native firebird type hence we always have to convert. return safelyRetrieveValue< ORowSetValue >(nColumnIndex); } Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; return Sequence< sal_Int8 >(); // TODO: implement @@ -664,62 +658,53 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex) } sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int16 >(columnIndex, SQL_SHORT); } sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int32 >(columnIndex, SQL_LONG); } sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int64 >(columnIndex, SQL_INT64); } float SAL_CALL OResultSet::getFloat(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< float >(columnIndex, SQL_FLOAT); } double SAL_CALL OResultSet::getDouble(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< double >(columnIndex, SQL_DOUBLE); } // ---- XRow: More complex types ---------------------------------------------- OUString SAL_CALL OResultSet::getString(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< OUString >(nIndex); } Date SAL_CALL OResultSet::getDate(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< Date >(nIndex, SQL_TYPE_DATE); } Time SAL_CALL OResultSet::getTime(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< css::util::Time >(nIndex, SQL_TYPE_TIME); } DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< DateTime >(nIndex, SQL_TIMESTAMP); } -uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -730,7 +715,7 @@ uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw( return m_xMetaData; } -uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -740,7 +725,7 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) } -uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -758,7 +743,6 @@ uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) th } uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -772,7 +756,7 @@ uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex) } -uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -782,7 +766,7 @@ uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) thro } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap ) { (void) columnIndex; (void) typeMap; @@ -793,7 +777,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< } -void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::close() { SAL_INFO("connectivity.firebird", "close()."); @@ -806,7 +790,6 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exc uno::Reference< XInterface > SAL_CALL OResultSet::getStatement() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -814,34 +797,34 @@ uno::Reference< XInterface > SAL_CALL OResultSet::getStatement() return m_xStatement; } //----- XResultSet: unsupported change detection methods --------------------- -sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowDeleted() { ::dbtools::throwFunctionNotSupportedSQLException("rowDeleted not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowInserted() { ::dbtools::throwFunctionNotSupportedSQLException("rowInserted not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowUpdated() { ::dbtools::throwFunctionNotSupportedSQLException("rowUpdated not supported in firebird", *this); return false; } -void SAL_CALL OResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::refreshRow() { ::dbtools::throwFunctionNotSupportedSQLException("refreshRow not supported in firebird", *this); } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OResultSet::cancel( ) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -887,25 +870,23 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ---- XServiceInfo ----------------------------------------------------------- -OUString SAL_CALL OResultSet::getImplementationName() throw ( RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getImplementationName() { return OUString("com.sun.star.sdbcx.firebird.ResultSet"); } Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames() - throw( RuntimeException, std::exception) { return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"}; } sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) - throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index 7d2a7c40bfec..75b0d6fcd60d 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -115,14 +115,10 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL checkColumnIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::uno::RuntimeException); + void SAL_CALL checkColumnIndex( sal_Int32 index ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL checkRowIndex() - throw (css::sdbc::SQLException, - css::uno::RuntimeException); + void SAL_CALL checkRowIndex(); // you can't delete objects of this type virtual ~OResultSet() override; @@ -138,60 +134,59 @@ namespace connectivity // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& rType) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier #if 0 virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; @@ -199,9 +194,7 @@ namespace connectivity #endif // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) override; }; diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 7d2dd2f392a5..79262d8f1d70 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -40,25 +40,23 @@ OResultSetMetaData::~OResultSetMetaData() } void OResultSetMetaData::verifyValidColumn(sal_Int32 column) - throw(SQLException) { if (column>getColumnCount() || column < 1) throw SQLException("Invalid column specified", *this, OUString(), 0, Any()); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() { return m_pSqlda->sqld; } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { verifyValidColumn(column); return 32; // Hard limit for firebird } sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -69,7 +67,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // Firebird is generally case sensitive when using quoted identifiers. // IF THIS CHANGES make ResultSet::findColumn to be case-insensitive as needed. @@ -81,14 +78,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return OUString(); // Schemas supported by firebird } OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); OUString sRet(m_pSqlda->sqlvar[column-1].sqlname, @@ -99,7 +94,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); return OUString(m_pSqlda->sqlvar[column-1].relname, @@ -108,14 +102,12 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return OUString(); // Catalogs not supported by firebird } OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -126,7 +118,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // aliasname verifyValidColumn(column); @@ -138,7 +129,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // TODO: implement (void) column; @@ -146,14 +136,12 @@ OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return false; } sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { OUString sTable = getTableName(column); if( !sTable.isEmpty() ) @@ -190,7 +178,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // Unsigned values aren't supported in firebird. (void) column; @@ -198,7 +185,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { sal_Int32 nType = getColumnType(column); if( nType == DataType::NUMERIC || nType == DataType::DECIMAL ) @@ -234,13 +220,11 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return -(m_pSqlda->sqlvar[column-1].sqlscale); // fb stores negative number } sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { if (m_pSqlda->sqlvar[column-1].sqltype & 1) return ColumnValue::NULLABLE; @@ -249,7 +233,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // TODO: Can the column be used as part of a where clause? Assume yes (void) column; @@ -257,20 +240,18 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return m_pConnection->isReadOnly(); // Readonly only available on db level } sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return !m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { (void) column; return !m_pConnection->isReadOnly(); diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx index a183e97cd70a..d6dffe0cd708 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx @@ -44,7 +44,7 @@ namespace connectivity virtual ~OResultSetMetaData() override; /// @throws css::sdbc::SQLException - void verifyValidColumn(sal_Int32 column) throw(css::sdbc::SQLException); + void verifyValidColumn(sal_Int32 column); public: // a constructor, which is required for returning objects: OResultSetMetaData(Connection* pConnection, @@ -53,48 +53,27 @@ namespace connectivity , m_pSqlda(pSqlda) {} - virtual sal_Int32 SAL_CALL getColumnCount() - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount() override; + virtual sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isSearchable(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isCurrency(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; }; } } diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx index a13414ca268e..8ec604760251 100644 --- a/connectivity/source/drivers/firebird/Statement.cxx +++ b/connectivity/source/drivers/firebird/Statement.cxx @@ -52,16 +52,15 @@ using namespace ::std; // ---- XBatchExecution - UNSUPPORTED ---------------------------------------- void SAL_CALL OStatement::addBatch(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { (void) sql; } -void SAL_CALL OStatement::clearBatch() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement::clearBatch() { } -Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() { return Sequence< sal_Int32 >(); } @@ -95,7 +94,6 @@ void OStatement::disposeResultSet() // ---- XStatement ----------------------------------------------------------- sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { execute(sql); return getStatementChangeCount(); @@ -103,7 +101,6 @@ sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql) uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -149,7 +146,6 @@ uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& s } sal_Bool SAL_CALL OStatement::execute(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { uno::Reference< XResultSet > xResults = executeQuery(sql); return xResults.is(); @@ -157,7 +153,6 @@ sal_Bool SAL_CALL OStatement::execute(const OUString& sql) } uno::Reference< XConnection > SAL_CALL OStatement::getConnection() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -165,7 +160,7 @@ uno::Reference< XConnection > SAL_CALL OStatement::getConnection() return uno::Reference<XConnection>(m_pConnection.get()); } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_Base::queryInterface(rType); if(!aRet.hasValue()) @@ -176,7 +171,6 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep } uno::Sequence< Type > SAL_CALL OStatement::getTypes() - throw(RuntimeException, std::exception) { return concatSequences(OStatement_Base::getTypes(), OStatementCommonBase::getTypes()); diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index 308d2f9ae478..248a2a65fb1a 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -58,31 +58,25 @@ namespace connectivity // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - executeQuery(const ::rtl::OUString& sql) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + executeQuery(const ::rtl::OUString& sql) override; + virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) override; virtual sal_Bool SAL_CALL - execute(const ::rtl::OUString& sql) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + execute(const ::rtl::OUString& sql) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL - getConnection() - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + getConnection() override; // XBatchExecution - UNSUPPORTED - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) override; + virtual void SAL_CALL clearBatch( ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) override; // XInterface virtual css::uno::Any SAL_CALL - queryInterface(const css::uno::Type & rType) - throw(css::uno::RuntimeException, std::exception) override; + queryInterface(const css::uno::Type & rType) override; //XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw(css::uno::RuntimeException, std::exception) override; + getTypes() override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index bd1c4b7f23d1..1cf44a849636 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -68,7 +68,6 @@ void OStatementCommonBase::disposeResultSet() } void OStatementCommonBase::freeStatementHandle() - throw (SQLException) { if (m_aStatementHandle) { @@ -82,7 +81,7 @@ void OStatementCommonBase::freeStatementHandle() } -Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) { Any aRet = OStatementCommonBase_Base::queryInterface(rType); if(!aRet.hasValue()) @@ -90,7 +89,7 @@ Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(Ru return aRet; } -Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) { ::cppu::OTypeCollection aTypes( ::cppu::UnoType<XMultiPropertySet>::get(), @@ -101,7 +100,7 @@ Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeExcept } -void SAL_CALL OStatementCommonBase::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OStatementCommonBase::cancel( ) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -109,7 +108,6 @@ void SAL_CALL OStatementCommonBase::cancel( ) throw(RuntimeException, std::exce } void SAL_CALL OStatementCommonBase::close() - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "close"); @@ -126,7 +124,6 @@ void SAL_CALL OStatementCommonBase::close() void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql, XSQLDA*& pOutSqlda, XSQLDA* pInSqlda) - throw (SQLException) { MutexGuard aGuard(m_aMutex); @@ -223,7 +220,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql, } // ---- XMultipleResults - UNSUPPORTED ---------------------------------------- -uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() { // TODO: verify we really can't support this // return uno::Reference< XResultSet >(); @@ -233,7 +230,7 @@ uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw return m_xResultSet; } -sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() { // TODO: verify we really can't support this return false; @@ -241,7 +238,7 @@ sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, Run // checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); } -sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() { // TODO: verify we really can't support this return 0; @@ -249,12 +246,12 @@ sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, Ru // ---- XWarningsSupplier - UNSUPPORTED ---------------------------------------- -Any SAL_CALL OStatementCommonBase::getWarnings() throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OStatementCommonBase::getWarnings() { return Any(); } -void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatementCommonBase::clearWarnings() { } @@ -300,7 +297,6 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { (void) rConvertedValue; (void) rOldValue; @@ -311,7 +307,7 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue( return bConverted; } -void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { (void) rValue; // set the value to what ever is necessary @@ -362,13 +358,12 @@ void SAL_CALL OStatementCommonBase::release() throw() OStatementCommonBase_Base::release(); } -uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) +uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } short OStatementCommonBase::getSqlInfoItem(char aInfoItem) - throw (SQLException) { ISC_STATUS_ARRAY aStatusVector; ISC_STATUS aErr; @@ -396,7 +391,6 @@ short OStatementCommonBase::getSqlInfoItem(char aInfoItem) } bool OStatementCommonBase::isDDLStatement() - throw (SQLException) { if (getSqlInfoItem(isc_info_sql_stmt_type) == isc_info_sql_stmt_ddl) return true; @@ -405,7 +399,6 @@ bool OStatementCommonBase::isDDLStatement() } sal_Int32 OStatementCommonBase::getStatementChangeCount() - throw (SQLException) { const short aStatementType = getSqlInfoItem(isc_info_sql_stmt_type); diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index 11d9c3dab52b..856ebc807ff9 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -66,8 +66,7 @@ namespace connectivity protected: virtual void disposeResultSet(); /// @throws css::sdbc::SQLException - void freeStatementHandle() - throw (css::sdbc::SQLException); + void freeStatementHandle(); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -78,11 +77,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -91,18 +89,14 @@ namespace connectivity /// @throws css::sdbc::SQLException void prepareAndDescribeStatement(const OUString& sqlIn, XSQLDA*& pOutSqlda, - XSQLDA* pInSqlda=nullptr) - throw (css::sdbc::SQLException); + XSQLDA* pInSqlda=nullptr); /// @throws css::sdbc::SQLException - short getSqlInfoItem(char aInfoItem) - throw (css::sdbc::SQLException); + short getSqlInfoItem(char aInfoItem); /// @throws css::sdbc::SQLException - bool isDDLStatement() - throw (css::sdbc::SQLException); + bool isDDLStatement(); /// @throws css::sdbc::SQLException - sal_Int32 getStatementChangeCount() - throw (css::sdbc::SQLException); + sal_Int32 getStatementChangeCount(); public: @@ -118,25 +112,25 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XWarningsSupplier - UNSUPPORTED - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XMultipleResults - UNSUPPORTED - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; }; } diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index 9a6739e59a45..ea03c6512b6f 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -56,7 +56,7 @@ namespace connectivity css::lang::XComponent* _pObject); /// @throws css::lang::DisposedException - void checkDisposed(bool _bThrow) throw ( css::lang::DisposedException ); + void checkDisposed(bool _bThrow); template <class TYPE> diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index fea904630ffb..7f71d1ebfbac 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -112,7 +112,6 @@ OCollection* Table::createIndexes(const TStringVector& rNames) //----- XAlterTable ----------------------------------------------------------- void SAL_CALL Table::alterColumnByName(const OUString& rColName, const uno::Reference< XPropertySet >& rDescriptor) - throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(WeakComponentImplHelperBase::rBHelper.bDisposed); @@ -223,7 +222,6 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName, // ----- XRename -------------------------------------------------------------- void SAL_CALL Table::rename(const OUString& rName) - throw(SQLException, ElementExistException, RuntimeException, std::exception) { (void) rName; throw RuntimeException(); // Firebird doesn't support this. @@ -231,7 +229,6 @@ void SAL_CALL Table::rename(const OUString& rName) // ----- XInterface ----------------------------------------------------------- Any SAL_CALL Table::queryInterface(const Type& rType) - throw(RuntimeException, std::exception) { if (rType.getTypeName() == "com.sun.star.sdbcx.XRename") return Any(); @@ -241,7 +238,6 @@ Any SAL_CALL Table::queryInterface(const Type& rType) // ----- XTypeProvider -------------------------------------------------------- uno::Sequence< Type > SAL_CALL Table::getTypes() - throw(RuntimeException, std::exception) { uno::Sequence< Type > aTypes = OTableHelper::getTypes(); diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx index 7ea9f48734f8..c1bcc161674b 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -64,26 +64,18 @@ namespace connectivity */ virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& rColName, - const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) - throw(css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override; // XRename -- UNSUPPORTED - virtual void SAL_CALL rename(const ::rtl::OUString& sName) - throw(css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename(const ::rtl::OUString& sName) override; //XInterface virtual css::uno::Any - SAL_CALL queryInterface(const css::uno::Type & rType) - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL queryInterface(const css::uno::Type & rType) override; //XTypeProvider virtual css::uno::Sequence< css::uno::Type > - SAL_CALL getTypes() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getTypes() override; }; diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx index bc15f9040e46..2643a7aa7a0c 100644 --- a/connectivity/source/drivers/firebird/Tables.cxx +++ b/connectivity/source/drivers/firebird/Tables.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; //----- OCollection ----------------------------------------------------------- void Tables::impl_refresh() - throw(RuntimeException) { static_cast<Catalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index 1a0a3580efd7..e106b8b65c4d 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -32,8 +32,7 @@ namespace connectivity static OUString createStandardColumnPart(const css::uno::Reference< css::beans::XPropertySet >& xColProp,const css::uno::Reference< com::sun::star::sdbc::XConnection>& _xConnection); // OCollection - virtual void impl_refresh() - throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( const ::rtl::OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > diff --git a/connectivity/source/drivers/firebird/Users.cxx b/connectivity/source/drivers/firebird/Users.cxx index 4316a5814039..832872c51e66 100644 --- a/connectivity/source/drivers/firebird/Users.cxx +++ b/connectivity/source/drivers/firebird/Users.cxx @@ -41,7 +41,6 @@ Users::Users(const uno::Reference< XDatabaseMetaData >& rMetaData, //----- OCollection ----------------------------------------------------------- void Users::impl_refresh() - throw(RuntimeException) { // TODO: IMPLEMENT ME } diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx index 975bd1376263..75ba14499eb5 100644 --- a/connectivity/source/drivers/firebird/Users.hxx +++ b/connectivity/source/drivers/firebird/Users.hxx @@ -29,8 +29,7 @@ namespace connectivity m_xMetaData; // OCollection - virtual void impl_refresh() - throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( const ::rtl::OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx index 7d72900a4788..bd84bba0c9a9 100644 --- a/connectivity/source/drivers/firebird/Util.cxx +++ b/connectivity/source/drivers/firebird/Util.cxx @@ -56,7 +56,6 @@ OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector, void firebird::evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector, const OUString& rCause, const uno::Reference< XInterface >& _rxContext) - throw(SQLException) { if (IndicatesError(rStatusVector)) { diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index c66ecd7d1209..b37b8718e9b8 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -60,8 +60,7 @@ namespace connectivity */ void evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector, const ::rtl::OUString& aCause, - const css::uno::Reference< css::uno::XInterface >& _rxContext) - throw (css::sdbc::SQLException); + const css::uno::Reference< css::uno::XInterface >& _rxContext); sal_Int32 getColumnTypeFromFBType(short aType, short aSubType); ::rtl::OUString getColumnTypeNameFromFBType(short aType, short aSubType); diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index 748bdae64f54..dcd6e689b19f 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -60,7 +60,6 @@ IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connecti void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { osl_atomic_increment( &m_refCount ); @@ -105,7 +104,7 @@ void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValu m_bShowDeleted = true; // we do not supported rows for this type } -Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -134,7 +133,7 @@ css::uno::Reference< XTablesSupplier > OFlatConnection::createCatalog() return xTab; } -Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -146,7 +145,7 @@ Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) throw(SQLE return xStmt; } -Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -160,7 +159,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons return xStmt; } -Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index fe5d88f64cab..a1a80ff0d14d 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -148,7 +148,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -236,7 +236,7 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( return xRef; } -OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return "sdbc:flat:" + m_pConnection->getURL(); diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 6fdc55c73882..1219f46cf7b8 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -38,24 +38,24 @@ using namespace css::lang; // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.flat.ODriver"); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } -Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -73,12 +73,11 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:flat:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) { if ( acceptsURL(url) ) { diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 4a8c37900198..60e0e851e465 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -44,12 +44,12 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, cppu::UnoType<bool>::get()); } -OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OFlatResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.flat.ResultSet"); } -Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -57,12 +57,12 @@ Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw return aSupported; } -sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) { if(rType == cppu::UnoType<XDeleteRows>::get()|| rType == cppu::UnoType<XResultSetUpdate>::get() || rType == cppu::UnoType<XRowUpdate>::get()) @@ -72,7 +72,7 @@ Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeE return aRet.hasValue() ? aRet : OFlatResultSet_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException, std::exception) +Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) { Sequence< Type > aTypes = OResultSet::getTypes(); ::std::vector<Type> aOwnTypes; @@ -94,7 +94,7 @@ Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException, // XRowLocate -Any SAL_CALL OFlatResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL OFlatResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -102,7 +102,7 @@ Any SAL_CALL OFlatResultSet::getBookmark( ) throw( SQLException, RuntimeExcept return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } -sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -113,7 +113,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true); } -sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -127,17 +127,17 @@ sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, } -sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) { return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL; } -sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const Any& bookmark ) { return comphelper::getINT32(bookmark); } @@ -164,7 +164,7 @@ void SAL_CALL OFlatResultSet::release() throw() OFlatResultSet_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 21b20cbcb943..fea263b95ccf 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -516,7 +516,7 @@ void SAL_CALL OFlatTable::disposing() m_aColumns = nullptr; } -Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OFlatTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); vector<Type> aOwnTypes; @@ -538,7 +538,7 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException, std:: } -Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType<XKeysSupplier>::get()|| rType == cppu::UnoType<XIndexesSupplier>::get()|| @@ -569,7 +569,7 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OFlatTable::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/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index a3baf0f021d5..a17eedd41f10 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -121,7 +121,7 @@ void OHCatalog::refreshUsers() m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this); } -Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) { if ( rType == cppu::UnoType<XGroupsSupplier>::get()) return Any(); @@ -129,7 +129,7 @@ Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeExcept return OCatalog::queryInterface(rType); } -Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OHCatalog::getTypes( ) { Sequence< Type > aTypes = OCatalog::getTypes(); ::std::vector<Type> aOwnTypes; diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx index a63d829c9f9d..2aae09029ad9 100644 --- a/connectivity/source/drivers/hsqldb/HColumns.cxx +++ b/connectivity/source/drivers/hsqldb/HColumns.cxx @@ -67,7 +67,7 @@ void OHSQLColumn::construct() return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } -Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) { Sequence< OUString > aSupported { "com.sun.star.sdbcx.Column" }; diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index ff9a98c0e082..7f7032525ae5 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -121,7 +121,7 @@ namespace connectivity { namespace hsqldb // XFlushable - void SAL_CALL OHsqlConnection::flush( ) throw (RuntimeException, std::exception) + void SAL_CALL OHsqlConnection::flush( ) { MethodGuard aGuard( *this ); @@ -166,21 +166,21 @@ namespace connectivity { namespace hsqldb } - void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) { MethodGuard aGuard( *this ); m_aFlushListeners.addInterface( l ); } - void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) { MethodGuard aGuard( *this ); m_aFlushListeners.removeInterface( l ); } - Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException, std::exception) + Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& TableName, ::sal_Int32 /*_ColorMode*/ ) { MethodGuard aGuard( *this ); @@ -192,7 +192,7 @@ namespace connectivity { namespace hsqldb } - Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) + Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) { MethodGuard aGuard( *this ); diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index af24d3190e4f..ba542ff972d0 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -75,7 +75,7 @@ namespace connectivity namespace hsqldb { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) + Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) { return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac))); } @@ -168,7 +168,7 @@ namespace connectivity } - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -382,7 +382,7 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) { sal_Bool bEnabled = false; javaFrameworkError e = jfw_getEnabled(&bEnabled); @@ -404,7 +404,7 @@ namespace connectivity } - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException, std::exception) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); @@ -434,19 +434,19 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) { return 1; } - sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) { return 0; } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed); @@ -472,7 +472,7 @@ namespace connectivity } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) { @@ -487,12 +487,12 @@ namespace connectivity // XServiceInfo - OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) + OUString ODriverDelegator::getImplementationName_Static( ) { return OUString("com.sun.star.sdbcx.comp.hsqldb.Driver"); } - Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -500,22 +500,22 @@ namespace connectivity return aSNS; } - OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } - void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, css::container::ElementExistException, RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XCreateCatalog::createCatalog", *this ); } @@ -555,7 +555,7 @@ namespace connectivity m_aConnections.erase(_aIter); } - void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source ) { ::osl::MutexGuard aGuard(m_aMutex); Reference<XConnection> xCon(Source.Source,UNO_QUERY); @@ -625,7 +625,7 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -668,15 +668,15 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ ) { } - void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ ) { } - void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ ) { } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 8a2aea665be8..6bcecb57509a 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -143,7 +143,7 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -151,7 +151,7 @@ sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru } // XAlterTable -void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -338,7 +338,7 @@ void OHSQLTable::executeStatement(const OUString& _rStatement ) } } -Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) { if ( m_Type == "VIEW" ) { @@ -360,7 +360,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException, std:: } // XRename -void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL OHSQLTable::rename( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -396,7 +396,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, } -Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) { if( m_Type == "VIEW" && rType == cppu::UnoType<XRename>::get()) return Any(); diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index 30ff90cea020..bdf01be13a1b 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -88,7 +88,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return xRet; } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast<OHCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx index 84c84fb5a273..6d1b5f1b254e 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx @@ -32,19 +32,16 @@ namespace connectivity // XEventListener void SAL_CALL OConnectionController::disposing( const EventObject& /*Source*/ ) -throw( RuntimeException, std::exception ) { } // XTerminateListener void SAL_CALL OConnectionController::queryTermination( const EventObject& /*aEvent*/ ) -throw( TerminationVetoException, RuntimeException, std::exception ) { m_pDriver->flushConnections(); } void SAL_CALL OConnectionController::notifyTermination( const EventObject& /*aEvent*/ ) -throw( RuntimeException, std::exception ) { m_pDriver->shutdownConnections(); } diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index 5b5a86da9713..62e8ec79d660 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx @@ -39,14 +39,11 @@ namespace connectivity explicit OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){} // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) - throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override; }; } diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index e736830af6be..a73df49dec7a 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() } typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER; -sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 return nRights; } -void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) +void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) { nRightsWithGrant = nRights = 0; // first we need to create the sql stmt to select the privs @@ -192,7 +192,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_In } } -sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, s return nRightsWithGrant; } -void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -229,7 +229,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 obj } } -void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -256,7 +256,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 ob } // XUser -void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 771645269f9c..812d8edcd237 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -54,7 +54,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName) return new OHSQLUser(m_xConnection,_rName); } -void OUsers::impl_refresh() throw(RuntimeException) +void OUsers::impl_refresh() { m_pParent->refreshUsers(); } diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index f98dcd57367a..e2ee450581e9 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.cxx @@ -69,7 +69,7 @@ namespace connectivity { namespace hsqldb IMPLEMENT_FORWARD_XTYPEPROVIDER2( HView, HView_Base, HView_IBASE ) - void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException, std::exception) + void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) { // not really atomic ... as long as we do not have something like // ALTER VIEW <name> TO <command> diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index dc0dd69de886..54de4ebe9940 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -73,7 +73,7 @@ sdbcx::ObjectType HViews::createObject(const OUString& _rName) } -void HViews::impl_refresh( ) throw(RuntimeException) +void HViews::impl_refresh( ) { static_cast<OHCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 87928d901fe2..445848483dd6 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -40,19 +40,19 @@ jclass java_sql_Array::getMyClass() const return theClass; } -OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Array::getBaseTypeName( ) { static jmethodID mID(nullptr); return callStringMethod("getBaseTypeName",mID); } -sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) { static jmethodID mID(nullptr); return callIntMethod_ThrowSQL("getBaseType", mID); } -css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -70,7 +70,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css return css::uno::Sequence< css::uno::Any >(); } -css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -88,7 +88,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa return css::uno::Sequence< css::uno::Any >(); } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -108,7 +108,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS return nullptr; } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index 9ec663127e77..7f0581104ada 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -48,7 +48,7 @@ jclass java_sql_Blob::getMyClass() const return theClass; } -sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::length( ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -65,7 +65,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(css::sdbc::SQLException, css: } //t.pEnv return (sal_Int64)out; } -css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -91,7 +91,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, return aSeq; } -css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -100,7 +100,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinarySt return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -130,7 +130,7 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 > return (sal_Int64)out; } -sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this ); // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index c74ae7815552..f9c3d426bdbf 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -54,13 +54,13 @@ java_sql_CallableStatement::~java_sql_CallableStatement() } -Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) { Any aRet = java_sql_PreparedStatement::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< css::sdbc::XRow*>(this),static_cast< css::sdbc::XOutParameters*>(this)); } -css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::sdbc::XRow>::get(), cppu::UnoType<css::sdbc::XOutParameters>::get()); @@ -68,7 +68,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTyp return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes()); } -sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -76,14 +76,14 @@ sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(css::sdbc::SQLEx return callBooleanMethod( "wasNull", mID ); } -sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex ); } -sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -91,7 +91,7 @@ sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) t jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod; return callMethodWithIntArg<jbyte>(pCallMethod,"getByte","(I)B",mID,columnIndex); } -Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -110,7 +110,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co } return aSeq; } -css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -118,7 +118,7 @@ css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIn jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); return out ? static_cast <css::util::Date>(java_sql_Date( t.pEnv, out )) : css::util::Date(); } -double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -127,7 +127,7 @@ double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) t return callMethodWithIntArg<double>(pCallMethod,"getDouble","(I)D",mID,columnIndex); } -float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -136,7 +136,7 @@ float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) thr return callMethodWithIntArg<jfloat>(pCallMethod,"getFloat","(I)F",mID,columnIndex); } -sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) t return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex); } -sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -153,7 +153,7 @@ sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) return callMethodWithIntArg<jlong>(pCallMethod,"getLong","(I)J",mID,columnIndex); } -Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -163,7 +163,7 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const return Any(); } -sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -172,7 +172,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) return callMethodWithIntArg<jshort>(pCallMethod,"getShort","(I)S",mID,columnIndex); } -OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -182,7 +182,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return callStringMethodWithIntArg("getString",mID,columnIndex); } - css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) + css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -192,7 +192,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return out ? static_cast <css::util::Time> (java_sql_Time( t.pEnv, out )) : css::util::Time(); } - css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) + css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -202,7 +202,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return out ? static_cast <css::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : css::util::DateTime(); } -void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -223,7 +223,7 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } -void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -252,18 +252,18 @@ jclass java_sql_CallableStatement::getMyClass() const return theClass; } -Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) { Reference< css::sdbc::XBlob > xBlob = getBlob(columnIndex); return xBlob.is() ? xBlob->getBinaryStream() : Reference< css::io::XInputStream >(); } -Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) { Reference< css::sdbc::XClob > xClob = getClob(columnIndex); return xClob.is() ? xClob->getCharacterStream() : Reference< css::io::XInputStream >(); } -Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -273,7 +273,7 @@ Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sa return out==nullptr ? nullptr : new java_sql_Array( t.pEnv, out ); } -Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -282,7 +282,7 @@ Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_ // WARNING: the caller becomes the owner of the returned pointer return out==nullptr ? nullptr : new java_sql_Clob( t.pEnv, out ); } -Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -292,7 +292,7 @@ Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_ return out==nullptr ? nullptr : new java_sql_Blob( t.pEnv, out ); } -Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index 44424c9084ae..e309a32ffb52 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -47,7 +47,7 @@ jclass java_sql_Clob::getMyClass() const return theClass; } -sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::length( ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -65,7 +65,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(css::sdbc::SQLException, css: return (sal_Int64)out; } -OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); OUString aStr; @@ -84,7 +84,7 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin return aStr; } -css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) { SDBThreadAttach t; static jmethodID mID(nullptr); @@ -94,7 +94,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacte return out==nullptr ? nullptr : new java_io_Reader( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -116,7 +116,7 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 return (sal_Int64)out; } -sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const css::uno::Reference< css::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const css::uno::Reference< css::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XClob::positionOfClob", *this ); // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index acc09749faa9..f0dcd168cbb7 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -69,7 +69,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_getTypeInfo_throw( ) return impl_callResultSetMethod( "getTypeInfo", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs( ) { static jmethodID mID(nullptr); return impl_callResultSetMethod( "getCatalogs", mID ); @@ -81,21 +81,21 @@ OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) return impl_callStringMethod( "getCatalogSeparator", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) { static jmethodID mID(nullptr); return impl_callResultSetMethod( "getSchemas", mID ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumnPrivileges( - const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getColumnPrivileges", mID, catalog, schema, table, &columnNamePattern ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern ); @@ -103,7 +103,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) { static const char * const cMethodName = "getTables"; @@ -217,87 +217,87 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns( - const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getProcedureColumns", mID, catalog, schemaPattern, procedureNamePattern, &columnNamePattern ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedures( const Any& - catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) + catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getProcedures", mID, catalog, schemaPattern, procedureNamePattern ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxBinaryLiteralLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxRowSize", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxCatalogNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxCharLiteralLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInIndex", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxCursorNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxConnections", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInTable", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxStatementLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxTableNameLength", mID); @@ -310,21 +310,21 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getExportedKeys", mID, catalog, schema, table ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getImportedKeys", mID, catalog, schema, table ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table ); @@ -332,7 +332,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, - sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception) + sal_Bool unique, sal_Bool approximate ) { static const char * const cMethodName = "getIndexInfo"; @@ -373,7 +373,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier( const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) + sal_Bool nullable ) { static const char * const cMethodName = "getBestRowIdentifier"; @@ -412,7 +412,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) return new OResultSetPrivileges(this,catalog,schemaPattern,tableNamePattern); @@ -490,7 +490,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference( const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, - const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception) + const OUString& foreignSchema, const OUString& foreignTable ) { static const char * const cMethodName = "getCrossReference"; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName ); @@ -669,19 +669,19 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "doesMaxRowSizeIncludeBlobs", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesLowerCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesLowerCaseIdentifiers", mID ); @@ -693,19 +693,19 @@ bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return impl_callBooleanMethod( "storesMixedCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesMixedCaseIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesUpperCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesUpperCaseIdentifiers", mID ); @@ -723,19 +723,19 @@ bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return impl_callBooleanMethod( "supportsAlterTableWithDropColumn", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxIndexLength", mID); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsNonNullableColumns", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getCatalogTerm", mID ); @@ -747,13 +747,13 @@ OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return impl_callStringMethod( "getIdentifierQuoteString", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getExtraNameCharacters", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsDifferentTableCorrelationNames", mID ); @@ -765,67 +765,67 @@ bool java_sql_DatabaseMetaData::impl_isCatalogAtStart_throw( ) return impl_callBooleanMethod( "isCatalogAtStart", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "dataDefinitionIgnoredInTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "dataDefinitionCausesTransactionCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsDataManipulationTransactionsOnly", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsDataDefinitionAndDataManipulationTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsPositionedDelete", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsPositionedUpdate", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenStatementsAcrossRollback", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenStatementsAcrossCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenCursorsAcrossCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenCursorsAcrossRollback", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "supportsTransactionIsolationLevel", mID, level ); @@ -837,25 +837,25 @@ bool java_sql_DatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return impl_callBooleanMethod( "supportsSchemasInDataManipulation", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsANSI92FullSQL", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsANSI92EntryLevelSQL", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsIntegrityEnhancementFacility", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSchemasInIndexDefinitions", mID ); @@ -873,7 +873,7 @@ bool java_sql_DatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( return impl_callBooleanMethod( "supportsCatalogsInTableDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCatalogsInIndexDefinitions", mID ); @@ -885,13 +885,13 @@ bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( return impl_callBooleanMethod( "supportsCatalogsInDataManipulation", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOuterJoins", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) { static jmethodID mID(nullptr); return impl_callResultSetMethod( "getTableTypes", mID ); @@ -903,92 +903,92 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw( ) return impl_callIntMethod_ThrowSQL("getMaxStatements", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxProcedureNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxSchemaNameLength", mID); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "allProceduresAreCallable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsStoredProcedures", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSelectForUpdate", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "allTablesAreSelectable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "isReadOnly", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "usesLocalFiles", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "usesLocalFilePerTable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsTypeConversion", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullPlusNonNullIsNull", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsColumnAliasing", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsTableCorrelationNames", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) { static const char* const pMethodName = "supportsConvert"; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, fromType, toType ); @@ -1007,67 +1007,67 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType return out; } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsExpressionsInOrderBy", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsGroupBy", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsGroupByBeyondSelect", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsGroupByUnrelated", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMultipleTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMultipleResultSets", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsLikeEscapeClause", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOrderByUnrelated", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsUnion", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsUnionAll", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMixedCaseIdentifiers", mID ); @@ -1079,91 +1079,91 @@ bool java_sql_DatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( return impl_callBooleanMethod( "supportsMixedCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedAtEnd", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedAtStart", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedHigh", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedLow", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSchemasInProcedureCalls", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSchemasInPrivilegeDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCatalogsInProcedureCalls", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCatalogsInPrivilegeDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCorrelatedSubqueries", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInComparisons", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInExists", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInIns", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInQuantifieds", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) { OUString sURL = m_pConnection->getURL(); if ( sURL.isEmpty() ) @@ -1174,163 +1174,163 @@ OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, Runt return sURL; } -OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getUserName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDriverName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDriverVersion", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDatabaseProductVersion", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDatabaseProductName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getProcedureTerm", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSchemaTerm", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowRuntime("getDriverMajorVersion", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getDefaultTransactionIsolation", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowRuntime("getDriverMinorVersion", mID); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSQLKeywords", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSearchStringEscape", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getStringFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getTimeDateFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSystemFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getNumericFunctions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsExtendedSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCoreSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMinimumSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsFullOuterJoins", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsLimitedOuterJoins", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInGroupBy", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInOrderBy", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInSelect", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxUserNameLength", mID); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "supportsResultSetType", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) { static const char* const pMethodName = "supportsResultSetConcurrency"; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, setType, concurrency ); @@ -1349,61 +1349,61 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I return out; } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "ownUpdatesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "ownDeletesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "ownInsertsAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "othersUpdatesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "othersDeletesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "othersInsertsAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "updatesAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "deletesAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "insertsAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsBatchUpdates", mID ); @@ -1411,7 +1411,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLE Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, - const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException, std::exception) + const Sequence< sal_Int32 >& types ) { jobject out(nullptr); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index c63a1e491168..c3f3c01f8f7e 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -54,30 +54,30 @@ jclass java_io_InputStream::getMyClass() const } -sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) { static jmethodID mID(nullptr); callIntMethodWithIntArg_ThrowRuntime("skip",mID,nBytesToSkip); } -sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::available( ) { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("available", mID); } -void SAL_CALL java_io_InputStream::closeInput( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_InputStream::closeInput( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("close",mID); } -sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) { if (nBytesToRead < 0) throw css::io::BufferSizeExceededException( THROW_WHERE, *this ); diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index b311573fa8d3..a93cd4a12202 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -322,7 +322,7 @@ jclass java_sql_Connection::getMyClass() const } -OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_Connection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -331,7 +331,7 @@ OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, Runtim return callStringMethod("getCatalog",mID); } -Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -353,18 +353,18 @@ Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) thr return xMetaData; } -void SAL_CALL java_sql_Connection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::close( ) { dispose(); } -void SAL_CALL java_sql_Connection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::commit( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("commit", mID); } -sal_Bool SAL_CALL java_sql_Connection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Connection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -372,7 +372,7 @@ sal_Bool SAL_CALL java_sql_Connection::isClosed( ) throw(SQLException, RuntimeE return callBooleanMethod( "isClosed", mID ) && java_sql_Connection_BASE::rBHelper.bDisposed; } -sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -380,37 +380,37 @@ sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) throw(SQLException, Runtim return callBooleanMethod( "isReadOnly", mID ); } -void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) { static jmethodID mID(nullptr); callVoidMethodWithStringArg("setCatalog",mID,catalog); } -void SAL_CALL java_sql_Connection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::rollback( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("rollback", mID); } -sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) { static jmethodID mID(nullptr); return callBooleanMethod( "getAutoCommit", mID ); } -void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) { static jmethodID mID(nullptr); callVoidMethodWithBoolArg_ThrowSQL("setReadOnly", mID, readOnly); } -void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) { static jmethodID mID(nullptr); callVoidMethodWithBoolArg_ThrowSQL("setAutoCommit", mID, autoCommit); } -Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -422,7 +422,7 @@ Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMa return nullptr; } -void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -431,7 +431,7 @@ void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container:: } -sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -440,7 +440,7 @@ sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) throw(SQLExc return callIntMethod_ThrowSQL("getTransactionIsolation", mID); } -void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -449,7 +449,7 @@ void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) th callVoidMethodWithIntArg_ThrowSQL("setTransactionIsolation", mID, level); } -Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -490,7 +490,7 @@ OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL) return sSqlStatement; } -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -508,7 +508,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( return xReturn; } -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -526,7 +526,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const return xStmt; } -OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -554,13 +554,13 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQ return aStr; } -void SAL_CALL java_sql_Connection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::clearWarnings( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("clearWarnings", mID); } -Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_Connection::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 5d69146d4a43..bb1d45337318 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -52,42 +52,42 @@ java_sql_Driver::~java_sql_Driver() // static ServiceInfo -OUString java_sql_Driver::getImplementationName_Static( ) throw(RuntimeException) +OUString java_sql_Driver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.JDBCDriver"); // this name is referenced in the configuration and in the jdbc.xml // Please take care when changing it. } -Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) { Sequence<OUString> aSNS { "com.sun.star.sdbc.Driver" }; return aSNS; } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory))); } -OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL java_sql_Driver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const - Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) + Sequence< PropertyValue >& info ) { m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_CONNECTING_URL, url ); @@ -104,7 +104,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, return xOut; } -sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) { // don't ask the real driver for the url // I feel responsible for all jdbc url's @@ -127,7 +127,7 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLEx } Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString& url, - const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) + const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { @@ -236,12 +236,12 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) { return 0; } diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 9154c5c07efc..87259c28dbbe 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -115,7 +115,7 @@ void SAL_CALL OStatement_BASE2::release() throw() } -Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) { if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get()) return Any(); @@ -123,7 +123,7 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -140,7 +140,7 @@ Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeExc return ::comphelper::concatSequences(aTypes.getTypes(),aOldTypes); } -Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) throw (SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) { m_aLogger.log( LogLevel::FINE, STR_LOG_GENERATED_VALUES ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -182,7 +182,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) } -void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::cancel( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -191,7 +191,7 @@ void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::e } -void SAL_CALL java_sql_Statement_Base::close( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -202,7 +202,7 @@ void SAL_CALL java_sql_Statement_Base::close( ) throw(css::sdbc::SQLException, } -void SAL_CALL java_sql_Statement::clearBatch( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement::clearBatch( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -214,7 +214,7 @@ void SAL_CALL java_sql_Statement::clearBatch( ) throw(css::sdbc::SQLException, } -sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -248,7 +248,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw( } -Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -283,7 +283,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU return out==nullptr ? nullptr : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } -Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -291,14 +291,14 @@ Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) thr } -Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) { Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this)); return aRet.hasValue() ? aRet : java_sql_Statement_Base::queryInterface(rType); } -void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -311,7 +311,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(css::sdb } -Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -331,7 +331,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(css::s } -sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -345,7 +345,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) } -Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -357,7 +357,7 @@ Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSe } -sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -368,14 +368,14 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(css::sdbc:: } -sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) { static jmethodID mID(nullptr); return callBooleanMethod( "getMoreResults", mID ); } -Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_Statement_Base::getWarnings( ) { SDBThreadAttach t; createStatement(t.pEnv); @@ -393,7 +393,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(css::sdbc::SQLExcept return Any(); } -void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -406,26 +406,26 @@ void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(css::sdbc::SQLExc } } -sal_Int32 java_sql_Statement_Base::getQueryTimeOut() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getQueryTimeOut() { static jmethodID mID(nullptr); return impl_getProperty("getQueryTimeOut",mID); } -sal_Int32 java_sql_Statement_Base::getMaxRows() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getMaxRows() { static jmethodID mID(nullptr); return impl_getProperty("getMaxRows",mID); } -sal_Int32 java_sql_Statement_Base::getResultSetConcurrency() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getResultSetConcurrency() { static jmethodID mID(nullptr); return impl_getProperty("getResultSetConcurrency",mID,m_nResultSetConcurrency); } -sal_Int32 java_sql_Statement_Base::getResultSetType() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getResultSetType() { static jmethodID mID(nullptr); return impl_getProperty("getResultSetType",mID,m_nResultSetType); @@ -446,25 +446,25 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm return callIntMethod_ThrowRuntime(_pMethodName, _inout_MethodID); } -sal_Int32 java_sql_Statement_Base::getFetchDirection() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getFetchDirection() { static jmethodID mID(nullptr); return impl_getProperty("getFetchDirection",mID); } -sal_Int32 java_sql_Statement_Base::getFetchSize() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getFetchSize() { static jmethodID mID(nullptr); return impl_getProperty("getFetchSize",mID); } -sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getMaxFieldSize() { static jmethodID mID(nullptr); return impl_getProperty("getMaxFieldSize",mID); } -OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException) +OUString java_sql_Statement_Base::getCursorName() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -481,7 +481,7 @@ OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeExc return OUString(); } -void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -492,7 +492,7 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLExceptio } -void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setEscapeProcessing(bool _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -505,7 +505,7 @@ void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException callVoidMethodWithBoolArg_ThrowRuntime("setEscapeProcessing", mID, _par0); } -void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -515,7 +515,7 @@ void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, Ru callVoidMethodWithIntArg_ThrowRuntime("setMaxRows", mID, _par0); } -void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -525,7 +525,7 @@ void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQL clearObject(); } -void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -535,7 +535,7 @@ void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLExcepti clearObject(); } -void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -546,7 +546,7 @@ void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLExcept callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0); } -void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -558,7 +558,7 @@ void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0); } -void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -568,7 +568,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio callVoidMethodWithIntArg_ThrowRuntime("setMaxFieldSize", mID, _par0); } -void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setCursorName(const OUString &_par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -622,7 +622,6 @@ sal_Bool java_sql_Statement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { try { @@ -667,7 +666,6 @@ void java_sql_Statement_Base::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception, std::exception) { switch(nHandle) { @@ -823,7 +821,7 @@ void SAL_CALL java_sql_Statement::release() throw() OStatement_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 526cda6c1c42..ee084a45a6b1 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -71,7 +71,7 @@ jclass java_sql_PreparedStatement::getMyClass() const } -css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -81,7 +81,7 @@ css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::un static_cast< XPreparedBatchExecution*>(this)); } -css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(), cppu::UnoType<XParameters>::get(), @@ -92,7 +92,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTyp } -sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -105,7 +105,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(css::sdbc::SQLEx } -sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(css::sdbc } -void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -140,13 +140,13 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c } -css::uno::Reference< css::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) { return Reference< XConnection >(m_pConnection.get()); } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_QUERY ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -161,7 +161,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement } -void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex, bool(x) ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -174,7 +174,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, } -void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTE_PARAMETER, parameterIndex, (sal_Int32)x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -187,7 +187,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_DATE_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +201,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con } -void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIME_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -215,7 +215,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con } -void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIMESTAMP_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +228,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex callVoidMethod_ThrowSQL("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject()); } -void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_DOUBLE_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -241,7 +241,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d } -void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_FLOAT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -254,7 +254,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl } -void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_INT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_ } -void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_LONG_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -280,7 +280,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) { m_aLogger.log( LogLevel::FINER, STR_LOG_NULL_PARAMETER, parameterIndex, sqlType ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -293,31 +293,31 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XClob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XClob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XBlob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XBlob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XArray >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XArray >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XRef >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XRef >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -377,7 +377,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter } -void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -390,7 +390,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde } -void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -403,7 +403,7 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c } -void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_SHORT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -416,7 +416,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa } -void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTES_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -449,7 +449,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co } -void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { m_aLogger.log( LogLevel::FINER, STR_LOG_CHARSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -508,7 +508,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete } -void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BINARYSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -567,7 +567,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn } -void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::clearParameters( ) { m_aLogger.log( LogLevel::FINER, STR_LOG_CLEAR_PARAMETERS ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -582,7 +582,7 @@ void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(css::sdbc::S } //t.pEnv } -void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::clearBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -595,7 +595,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(css::sdbc::SQLExc } -void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::addBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -608,7 +608,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(css::sdbc::SQLExcept } -css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -627,7 +627,7 @@ css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatc return aSeq; } -css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 665caaf381d9..10c3e29341c2 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -45,12 +45,12 @@ jclass java_io_Reader::getMyClass() const return theClass; } -sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) { static jmethodID mID(nullptr); if(nBytesToSkip <= 0) @@ -74,7 +74,7 @@ void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io: } } -sal_Int32 SAL_CALL java_io_Reader::available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::available( ) { if(m_buf != boost::none) return 1; @@ -93,13 +93,13 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(css::io::NotConnectedExce return (m_buf != boost::none ? 1 : 0) + (out ? 1 : 0); // no way to tell *how much* is ready } -void SAL_CALL java_io_Reader::closeInput( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_Reader::closeInput( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("close", mID); } -sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) { OSL_ENSURE(aData.getLength() >= nBytesToRead," Sequence is smaller than BytesToRead"); diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index 84cf5f765457..c22001d6c477 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.cxx @@ -43,7 +43,7 @@ jclass java_sql_Ref::getMyClass() const return theClass; } -OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) { static jmethodID mID(nullptr); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 3550d736fbe1..ec446f973c5e 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -113,13 +113,13 @@ m_xMetaData.clear(); SDBThreadAttach::releaseRef(); } -css::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : java_sql_ResultSet_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -129,13 +129,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) t } -sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) { static jmethodID mID(nullptr); return callIntMethodWithStringArg("findColumn",mID,columnName); } -Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -145,7 +145,7 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out ); } -Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -156,14 +156,14 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStre } -sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex ); } -sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod; @@ -171,7 +171,7 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQL } -Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) { Sequence< sal_Int8 > aSeq; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -188,7 +188,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde } -css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -198,7 +198,7 @@ css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) th } -double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jdouble (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallDoubleMethod; @@ -206,7 +206,7 @@ double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQL } -float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jfloat (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallFloatMethod; @@ -214,21 +214,21 @@ float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLEx } -sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex); } -sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) { static jmethodID mID(nullptr); return callIntMethod_ThrowSQL("getRow", mID); } -sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jlong (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallLongMethod; @@ -236,7 +236,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ } -css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -245,7 +245,7 @@ css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, *m_pConnection ); } -Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -256,7 +256,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex } -Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -265,7 +265,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) return out==nullptr ? nullptr : new java_sql_Clob( t.pEnv, out ); } -Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -275,7 +275,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) } -Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -286,7 +286,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t } -Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) { jobject out(nullptr); Any aRet; @@ -347,7 +347,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen } -sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jshort (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallShortMethod; @@ -355,14 +355,14 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S } -OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getString",mID,columnIndex); } -css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -372,7 +372,7 @@ css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) th } -css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -382,131 +382,131 @@ css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnI } -sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isAfterLast", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isFirst( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isFirst", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isLast", mID ); } -void SAL_CALL java_sql_ResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::beforeFirst( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("beforeFirst", mID); } -void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::afterLast( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("afterLast", mID); } -void SAL_CALL java_sql_ResultSet::close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::close( ) { dispose(); } -sal_Bool SAL_CALL java_sql_ResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::first( ) { static jmethodID mID(nullptr); return callBooleanMethod( "first", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::last( ) { static jmethodID mID(nullptr); return callBooleanMethod( "last", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "absolute", mID,row ); } -sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "relative", mID,row ); } -sal_Bool SAL_CALL java_sql_ResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::previous( ) { static jmethodID mID(nullptr); return callBooleanMethod( "previous", mID ); } -Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement( ) { return m_xStatement; } -sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted( ) { static jmethodID mID(nullptr); return callBooleanMethod( "rowDeleted", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::rowInserted( ) { static jmethodID mID(nullptr); return callBooleanMethod( "rowInserted", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) { static jmethodID mID(nullptr); return callBooleanMethod( "rowUpdated", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isBeforeFirst", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::next( ) { static jmethodID mID(nullptr); return callBooleanMethod( "next", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) { static jmethodID mID(nullptr); return callBooleanMethod( "wasNull", mID ); } -void SAL_CALL java_sql_ResultSet::cancel( ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::cancel( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("cancel", mID); } -void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::clearWarnings( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("clearWarnings", mID); } -css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) { SDBThreadAttach t; static jmethodID mID(nullptr); @@ -524,100 +524,100 @@ css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(css::sdbc::SQLE } -void SAL_CALL java_sql_ResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::insertRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("insertRow", mID); } -void SAL_CALL java_sql_ResultSet::updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateRow", mID); } -void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::deleteRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("deleteRow", mID); } -void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("cancelRowUpdates", mID); } -void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("moveToInsertRow", mID); } -void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("moveToCurrentRow", mID); } -void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowSQL("updateNull", mID, columnIndex); } -void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateBoolean", "(IZ)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateByte", "(IB)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateShort", "(IS)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateInt", "(II)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateLong", "(IJ)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateFloat", "(IF)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateDouble", "(ID)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { SDBThreadAttach t; @@ -643,7 +643,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS } -void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) { SDBThreadAttach t; @@ -679,7 +679,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css: } -void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { java_sql_Date aD(x); static jmethodID mID(nullptr); @@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css:: } -void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { java_sql_Time aD(x); static jmethodID mID(nullptr); @@ -695,7 +695,7 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css:: } -void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { java_sql_Timestamp aD(x); static jmethodID mID(nullptr); @@ -703,7 +703,7 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const } -void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { try { @@ -734,7 +734,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con } } -void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { try { @@ -765,7 +765,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, } } -void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) { if(!::dbtools::implUpdateObject(this,columnIndex,x)) { @@ -779,7 +779,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css } -void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) { // OSL_FAIL("java_sql_ResultSet::updateNumericObject: NYI"); try @@ -821,50 +821,50 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co } } -sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getConcurrency", mID); } -sal_Int32 java_sql_ResultSet::getResultSetType() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getResultSetType() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getType",mID); } -sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getFetchDirection() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getFetchDirection", mID); } -sal_Int32 java_sql_ResultSet::getFetchSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getFetchSize() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getFetchSize", mID); } -OUString java_sql_ResultSet::getCursorName() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +OUString java_sql_ResultSet::getCursorName() const { static jmethodID mID(nullptr); return callStringMethod("getCursorName",mID); } -void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException) +void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0); } -void SAL_CALL java_sql_ResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::refreshRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("refreshRow",mID); } -void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException) +void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0); @@ -903,7 +903,6 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue( css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { bool bRet = false; switch(nHandle) @@ -929,7 +928,6 @@ void java_sql_ResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) { switch(nHandle) { @@ -989,7 +987,7 @@ void SAL_CALL java_sql_ResultSet::release() throw() java_sql_ResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index c016717a7b32..4bc977b6bd54 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -54,21 +54,21 @@ jclass java_sql_ResultSetMetaData::getMyClass() const } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getColumnDisplaySize",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getColumnType",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) { if ( m_nColumnCount == -1 ) { @@ -80,57 +80,57 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLExcep } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column ); } -OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getSchemaName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getTableName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getCatalogName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnTypeName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnLabel",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnClassName",mID,column); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) { if ( m_pConnection->isIgnoreCurrencyEnabled() ) return false; @@ -139,59 +139,59 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) thr } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isAutoIncrement", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isSigned", mID,column ); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getPrecision",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getScale",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("isNullable",mID,column); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isSearchable", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isReadOnly", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isDefinitelyWritable", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isWritable", mID,column ); diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index f1759cd77eb4..58580ccc16d2 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -103,7 +103,7 @@ jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _r } -java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info ) { java_util_Properties* pProps = new java_util_Properties(); const PropertyValue* pBegin = info.getConstArray(); diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index 06cc13cface7..9d7926af2a8c 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -78,7 +78,7 @@ void KabCatalog::refreshUsers() // XTablesSupplier -Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index c3c45faacdea..29b2580fc1b3 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -45,7 +45,7 @@ namespace connectivity // XTablesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; }; } } diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx index fe675ade9fcf..c94726d55001 100644 --- a/connectivity/source/drivers/kab/KColumns.cxx +++ b/connectivity/source/drivers/kab/KColumns.cxx @@ -78,7 +78,7 @@ sdbcx::ObjectType KabColumns::createObject(const OUString& _rName) return xRet; } -void KabColumns::impl_refresh() throw(RuntimeException) +void KabColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx index 80145a8bd5f3..887048347d42 100644 --- a/connectivity/source/drivers/kab/KColumns.hxx +++ b/connectivity/source/drivers/kab/KColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity KabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: KabColumns( KabTable* _pTable, diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index 2b40d1d8bd4c..d7945bb7d88b 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -71,7 +71,7 @@ void KabConnection::construct() } // XServiceInfo -Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL KabConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -83,7 +83,7 @@ Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLExc return xReturn; } -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -95,7 +95,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const return xReturn; } -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -104,7 +104,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUStr return nullptr; } -OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -112,14 +112,14 @@ OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLExc return _sSql; } -void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); // here you have to set your commit mode please have a look at the jdbc documentation to get a clear explanation } -sal_Bool SAL_CALL KabConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -129,7 +129,7 @@ sal_Bool SAL_CALL KabConnection::getAutoCommit( ) throw(SQLException, RuntimeEx return true; } -void SAL_CALL KabConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -137,7 +137,7 @@ void SAL_CALL KabConnection::commit( ) throw(SQLException, RuntimeException, st // when you database does support transactions you should commit here } -void SAL_CALL KabConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -145,7 +145,7 @@ void SAL_CALL KabConnection::rollback( ) throw(SQLException, RuntimeException, // same as commit but for the other case } -sal_Bool SAL_CALL KabConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -153,7 +153,7 @@ sal_Bool SAL_CALL KabConnection::isClosed( ) throw(SQLException, RuntimeExcepti return KabConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -170,7 +170,7 @@ Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) throw(SQL return xMetaData; } -void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setReadOnly( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -178,7 +178,7 @@ void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runtime // set you connection to readonly } -sal_Bool SAL_CALL KabConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -187,7 +187,7 @@ sal_Bool SAL_CALL KabConnection::isReadOnly( ) throw(SQLException, RuntimeExcep return false; } -void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setCatalog( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -195,7 +195,7 @@ void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, R // if your database doesn't work with catalogs you go to next method otherwise you know what to do } -OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -205,7 +205,7 @@ OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeExcep return OUString(); } -void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -214,7 +214,7 @@ void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExcep // please have a look at @see com.sun.star.sdbc.TransactionIsolation } -sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -224,7 +224,7 @@ sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) throw(SQLException return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -234,13 +234,13 @@ Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) return nullptr; } -void SAL_CALL KabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) { // the other way around } // XCloseable -void SAL_CALL KabConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -250,13 +250,13 @@ void SAL_CALL KabConnection::close( ) throw(SQLException, RuntimeException, std } // XWarningsSupplier -Any SAL_CALL KabConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabConnection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL KabConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::clearWarnings( ) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index 1c6781ae070a..0958cc1d39cb 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -83,7 +83,7 @@ namespace connectivity css::uno::Reference<css::sdbc::XDriver> const & driver); virtual ~KabConnection() override; - void closeAllStatements () throw( css::sdbc::SQLException); + void closeAllStatements (); // OComponentHelper virtual void SAL_CALL disposing() override; @@ -95,31 +95,31 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // needed for the SQL interpreter css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index 644f97bc97b9..70bfea861bb4 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -55,7 +55,7 @@ const OUString & KabDatabaseMetaData::getAddressBookTableName() return aAddressBookTableName; } -OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) { OUString aVal; if (m_bUseCatalog) @@ -65,73 +65,73 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLExceptio return aVal; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) { // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement, // currently, the resultset/statement implementations can cope with one table only @@ -139,63 +139,63 @@ sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLExcept return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn( ) { return false; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) { OUString aVal; if (m_bUseCatalog) @@ -204,25 +204,25 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, Ru return aVal; } -OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) { // normally this is " OUString aVal("\""); return aVal; } -OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) { bool bValue = false; if (m_bUseCatalog) @@ -231,326 +231,326 @@ sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, return bValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly( ) { // for the moment, we have read-only addresses, but this might change in the future return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getURL( ) { // if someday we support more than the default address book, // this method should return the URL which was used to create it @@ -558,145 +558,145 @@ OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeExc return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) { OUString aValue( "kab" ); return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() { OUString aValue(KAB_DRIVER_VERSION); return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion( ) { return KAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion( ) { return KAB_DRIVER_VERSION_MINOR; } -OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { switch (setType) { @@ -707,7 +707,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) { switch (setType) { @@ -718,62 +718,62 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 s return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection( ) { return m_xConnection.get(); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -791,7 +791,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQ return xRef; } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; @@ -828,19 +828,19 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLE return xRef; } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( const Any&, const OUString&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } @@ -849,7 +849,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( const Any&, const OUString&, const OUString& tableNamePattern, - const OUString& columnNamePattern) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; @@ -919,7 +919,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( const Any&, const OUString&, const OUString&, - const Sequence< OUString >& types) throw(SQLException, RuntimeException, std::exception) + const Sequence< OUString >& types) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -968,20 +968,20 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( const Any&, const OUString&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( const Any&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( - const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& table ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); @@ -1014,39 +1014,39 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( const Any&, const OUString&, const OUString&, - sal_Bool, sal_Bool ) throw(SQLException, RuntimeException, std::exception) + sal_Bool, sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( const Any&, const OUString&, const OUString&, sal_Int32, - sal_Bool ) throw(SQLException, RuntimeException, std::exception) + sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } @@ -1054,12 +1054,12 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( const Any&, const OUString&, const OUString&, const Any&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 69976d1aa95e..ac896c87d582 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -48,155 +48,155 @@ namespace connectivity // this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } } diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index 52c849270be0..d169d66ff7b1 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -360,12 +360,12 @@ void KabDriver::disposing() } // static ServiceInfo -OUString KabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString KabDriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc." KAB_SERVICE_NAME ".Driver"); } -Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) { // which service is supported // for more information @see com.sun.star.sdbc.Driver @@ -374,22 +374,22 @@ Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) throw (Runti return aSNS; } -OUString SAL_CALL KabDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL KabDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Sequence< PropertyValue >& ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -408,7 +408,6 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Seq } sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -419,33 +418,33 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url ) return url.startsWith("sdbc:address:" KAB_SERVICE_NAME); } -Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL KabDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDriver::getMajorVersion( ) { return KAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL KabDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDriver::getMinorVersion( ) { return KAB_DRIVER_VERSION_MINOR; } -void SAL_CALL KabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException, std::exception) +void SAL_CALL KabDriver::queryTermination( const EventObject& ) { // nothing to do, nothing to veto } -void SAL_CALL KabDriver::notifyTermination( const EventObject& ) throw (RuntimeException, std::exception) +void SAL_CALL KabDriver::notifyTermination( const EventObject& ) { m_aImplModule.shutdown(); } -void SAL_CALL KabDriver::disposing( const EventObject& ) throw (RuntimeException, std::exception) +void SAL_CALL KabDriver::disposing( const EventObject& ) { // not interested in (this is the disposing of the desktop, if any) } @@ -458,7 +457,7 @@ OUString KabDriver::impl_getConfigurationSettingsPath() return aPath.makeStringAndClear(); } -Reference< XInterface > SAL_CALL KabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception ) +Reference< XInterface > SAL_CALL KabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *(new KabDriver( comphelper::getComponentContext(_rxFactory))); } diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index b061b0040668..8a94db9ed180 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -144,11 +144,11 @@ namespace connectivity KabImplModule m_aImplModule; public: - static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); // XServiceInfo - static versions - static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static OUString getImplementationName_Static( ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); /** returns the path of our configuration settings */ @@ -161,23 +161,23 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion() override; + virtual sal_Int32 SAL_CALL getMinorVersion() override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: /** shuts down the library which contains the real implementations diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index b10cb8261356..5cf649696e4d 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(KabPreparedStatement, "com.sun.star.sdbc.drivers.KabPreparedStatement", "com.sun.star.sdbc.PreparedStatement"); -void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException) +void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) { if ( !m_aParameterRow.is() ) m_aParameterRow = new OValueVector(); @@ -45,7 +45,7 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL (m_aParameterRow->get()).resize(nParams); } -void KabPreparedStatement::setKabFields() const throw(SQLException) +void KabPreparedStatement::setKabFields() const { ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns @@ -61,12 +61,12 @@ void KabPreparedStatement::setKabFields() const throw(SQLException) m_xMetaData->setKabFields(xColumns); } -void KabPreparedStatement::resetParameters() const throw(SQLException) +void KabPreparedStatement::resetParameters() const { m_nParameterIndex = 0; } -void KabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException) +void KabPreparedStatement::getNextParameter(OUString &rParameter) const { if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { @@ -108,7 +108,7 @@ void KabPreparedStatement::disposing() } } -Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -122,7 +122,7 @@ Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() thr return xMetaData; } -void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::close() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -140,7 +140,7 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException // list } -sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabPreparedStatement::execute() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -150,7 +150,7 @@ sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeExc return xRS.is(); } -sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, Run return 0; } -Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -167,7 +167,7 @@ Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQ return m_pConnection; } -Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -177,7 +177,7 @@ Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLE return rs; } -void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -187,47 +187,47 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) (m_aParameterRow->get())[parameterIndex - 1].setNull(); } -void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", nullptr); } -void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) { ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", nullptr); } -void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) { ::dbtools::throwFunctionNotSupportedSQLException("setByte", nullptr); } -void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) { ::dbtools::throwFunctionNotSupportedSQLException("setShort", nullptr); } -void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setInt", nullptr); } -void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) { ::dbtools::throwFunctionNotSupportedSQLException("", nullptr); } -void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) { ::dbtools::throwFunctionNotSupportedSQLException("setFloat", nullptr); } -void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) { ::dbtools::throwFunctionNotSupportedSQLException("setDouble", nullptr); } -void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -237,38 +237,38 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OU (m_aParameterRow->get())[parameterIndex - 1] = x; } -void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBytes", nullptr); } -void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) { ::dbtools::throwFunctionNotSupportedSQLException("setDate", nullptr); } -void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const css::util::Time&) { ::dbtools::throwFunctionNotSupportedSQLException("setTime", nullptr); } -void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) { ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", nullptr); } -void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", nullptr); } -void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", nullptr); } -void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -276,37 +276,37 @@ void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const An } } -void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", nullptr); } -void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) { ::dbtools::throwFunctionNotSupportedSQLException("setRef", nullptr); } -void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBlob", nullptr); } -void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setClob", nullptr); } -void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) { ::dbtools::throwFunctionNotSupportedSQLException("setArray", nullptr); } -void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::clearParameters() { ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", nullptr); } -void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch (nHandle) { diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index 2b4f801232df..28b22d8e77a3 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -47,16 +47,16 @@ namespace connectivity mutable sal_Int32 m_nParameterIndex; OValueRow m_aParameterRow; - void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException); - void setKabFields() const throw(css::sdbc::SQLException); + void checkAndResizeParameters(sal_Int32 nParams); + void setKabFields() const; protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; - virtual void resetParameters() const throw(css::sdbc::SQLException) override; - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override; + virtual void resetParameters() const override; + virtual void getNextParameter(OUString &rParameter) const override; virtual ~KabPreparedStatement() override; public: @@ -67,44 +67,44 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; using KabCommonStatement::executeQuery; using KabCommonStatement::executeUpdate; using KabCommonStatement::execute; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; }; } } diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 8babcb4714e3..5527b998923c 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -116,7 +116,7 @@ m_xStatement.clear(); m_xMetaData.clear(); } -Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeException, std::exception) +Any SAL_CALL KabResultSet::queryInterface(const Type & rType) { Any aRet = OPropertySetHelper::queryInterface(rType); if (!aRet.hasValue()) @@ -134,7 +134,7 @@ void SAL_CALL KabResultSet::release() throw() KabResultSet_BASE::release(); } -Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL KabResultSet::getTypes() { OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), @@ -144,12 +144,12 @@ Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std: return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes()); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -169,7 +169,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQ return 0; // Never reached } -OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -206,7 +206,7 @@ return aRet; return aRet; } -sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -216,7 +216,7 @@ sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, Runtim return false; } -sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -227,7 +227,7 @@ sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeEx return nRet; } -sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -238,7 +238,7 @@ sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, Runtime return nRet; } -sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -249,7 +249,7 @@ sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeEx return nRet; } -sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -259,7 +259,7 @@ sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeE return sal_Int64(); } -float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL KabResultSet::getFloat(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -270,7 +270,7 @@ float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeExce return nVal; } -double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL KabResultSet::getDouble(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -281,7 +281,7 @@ double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeEx return nRet; } -Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -291,7 +291,7 @@ Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLExcepti return Sequence< sal_Int8 >(); } -cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException, std::exception) +cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -302,7 +302,7 @@ cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, Runtime return aRet; } -cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException, std::exception) +cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -313,7 +313,7 @@ cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, Runtime return nRet; } -cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception) +cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -352,7 +352,7 @@ cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw( return nRet; } -Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -362,7 +362,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) thro return nullptr; } -Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -372,7 +372,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) t return nullptr; } -Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -382,7 +382,7 @@ Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container: return Any(); } -Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -392,7 +392,7 @@ Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, R return nullptr; } -Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -402,7 +402,7 @@ Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, return nullptr; } -Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -412,7 +412,7 @@ Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, return nullptr; } -Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -422,7 +422,7 @@ Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLExceptio return nullptr; } -Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -434,7 +434,7 @@ Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLEx return xMetaData; } -sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isBeforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -445,7 +445,7 @@ sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeExcep return false; } -sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isAfterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -457,7 +457,7 @@ sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeExcepti return false; } -sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -468,7 +468,7 @@ sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException, return false; } -sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -480,7 +480,7 @@ sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException, s return false; } -void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::beforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -489,7 +489,7 @@ void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException, m_nRowPos = -1; } -void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::afterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -499,7 +499,7 @@ void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException, st m_nRowPos = nAddressees; } -void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::close() { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -508,7 +508,7 @@ void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException, std::e dispose(); } -sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::first() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -521,7 +521,7 @@ sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException, st return true; } -sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::last() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -534,7 +534,7 @@ sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException, std return true; } -sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::getRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -542,7 +542,7 @@ sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException, return m_nRowPos; } -sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -556,7 +556,7 @@ sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, Runt return true; } -sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -564,7 +564,7 @@ sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, Runt return absolute(m_nRowPos + row); } -sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::next() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -572,7 +572,7 @@ sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException, std return absolute(m_nRowPos + 1); } -sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::previous() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -580,7 +580,7 @@ sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException, return absolute(m_nRowPos - 1); } -Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL KabResultSet::getStatement() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -589,7 +589,7 @@ Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException return xStatement; } -sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::rowDeleted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -597,7 +597,7 @@ sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeExceptio return false; } -sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::rowInserted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeExcepti return false; } -sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::rowUpdated() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -613,7 +613,7 @@ sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeExceptio return false; } -sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::wasNull() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -621,22 +621,22 @@ sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException, return m_bWasNull; } -void SAL_CALL KabResultSet::cancel() throw(RuntimeException, std::exception) +void SAL_CALL KabResultSet::cancel() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::clearWarnings() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::clearWarnings() { } -Any SAL_CALL KabResultSet::getWarnings() throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabResultSet::getWarnings() { return Any(); } -void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::insertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -644,7 +644,7 @@ void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException, st // you only have to implement this if you want to insert new rows } -void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -652,19 +652,19 @@ void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException, st // only when you allow updates } -void SAL_CALL KabResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::deleteRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::cancelRowUpdates() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::moveToInsertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -672,122 +672,122 @@ void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcepti // only when you allow inserts } -void SAL_CALL KabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::moveToCurrentRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateNull(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) { checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) { checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::refreshRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } // XRowLocate -Any SAL_CALL KabResultSet::getBookmark() throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL KabResultSet::getBookmark() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -803,7 +803,7 @@ Any SAL_CALL KabResultSet::getBookmark() throw( SQLException, RuntimeException, return Any(); } -sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -825,7 +825,7 @@ sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) throw( SQLE return false; } -sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -846,7 +846,7 @@ sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal return false; } -sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -861,12 +861,12 @@ sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const return CompareBookmark::EQUAL; } -sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks() { return false; } -sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -877,7 +877,7 @@ sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) throw( SQLEx } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const Sequence< Any >&) throw( SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const Sequence< Any >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -921,7 +921,6 @@ sal_Bool KabResultSet::convertFastPropertyValue( Any &, sal_Int32 nHandle, const Any& ) - throw (css::lang::IllegalArgumentException) { switch (nHandle) { @@ -942,7 +941,6 @@ sal_Bool KabResultSet::convertFastPropertyValue( void KabResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& ) - throw (Exception, std::exception) { switch (nHandle) { diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index e448b710a73b..8edef8d9f5d4 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -74,12 +74,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -109,110 +107,110 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override; }; } } diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index 35290e538d84..88669bd2d6fa 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx @@ -36,7 +36,7 @@ KabResultSetMetaData::~KabResultSetMetaData() { } -void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException) +void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) { OSQLColumns::Vector::const_iterator aIter; static const char aName[] = "Name"; @@ -52,32 +52,32 @@ void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQ } } -sal_Int32 SAL_CALL KabResultSetMetaData::getColumnDisplaySize(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSetMetaData::getColumnDisplaySize(sal_Int32 column) { return m_aKabFields[column - 1] < KAB_DATA_FIELDS? 20: 50; } -sal_Int32 SAL_CALL KabResultSetMetaData::getColumnType(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSetMetaData::getColumnType(sal_Int32 column) { return m_aKabFields[column - 1] == KAB_FIELD_REVISION? DataType::TIMESTAMP: DataType::CHAR; } -sal_Int32 SAL_CALL KabResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSetMetaData::getColumnCount() { return m_aKabFields.size(); } -sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) { return true; } -OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) { return OUString(); } -OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) { sal_uInt32 nFieldNumber = m_aKabFields[column - 1]; ::KABC::Field::List aFields = ::KABC::Field::allFields(); @@ -96,79 +96,79 @@ OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQ return aName; } -OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) { return KabDatabaseMetaData::getAddressBookTableName(); } -OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) { return OUString(); } -OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) { return OUString(); } -OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) { return OUString(); } -OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) { return OUString(); } -sal_Bool SAL_CALL KabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isCurrency(sal_Int32) { return false; } -sal_Bool SAL_CALL KabResultSetMetaData::isAutoIncrement(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isAutoIncrement(sal_Int32) { return false; } -sal_Bool SAL_CALL KabResultSetMetaData::isSigned(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isSigned(sal_Int32) { return false; } -sal_Int32 SAL_CALL KabResultSetMetaData::getPrecision(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSetMetaData::getPrecision(sal_Int32) { return 0; } -sal_Int32 SAL_CALL KabResultSetMetaData::getScale(sal_Int32) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSetMetaData::getScale(sal_Int32) { return 0; } -sal_Int32 SAL_CALL KabResultSetMetaData::isNullable(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSetMetaData::isNullable(sal_Int32) { return (sal_Int32) true; // KDE address book currently does not use nullptr values. // But it might do it someday } -sal_Bool SAL_CALL KabResultSetMetaData::isSearchable(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isSearchable(sal_Int32) { return true; } -sal_Bool SAL_CALL KabResultSetMetaData::isReadOnly(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isReadOnly(sal_Int32) { return true; } -sal_Bool SAL_CALL KabResultSetMetaData::isDefinitelyWritable(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isDefinitelyWritable(sal_Int32) { return false; } -sal_Bool SAL_CALL KabResultSetMetaData::isWritable(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSetMetaData::isWritable(sal_Int32) { return false; } diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx index 557a289aa11f..f1e9348e55c6 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx @@ -50,31 +50,31 @@ namespace connectivity { return this; } void setKabFields( - const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException); + const ::rtl::Reference<connectivity::OSQLColumns> &xColumns); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aKabFields[columnIndex - 1]; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index f611f15bdd86..83e0bf26efee 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -75,17 +75,17 @@ KabCommonStatement::~KabCommonStatement() { } -void KabCommonStatement::resetParameters() const throw(css::sdbc::SQLException) +void KabCommonStatement::resetParameters() const { lcl_throwError(STR_PARA_ONLY_PREPARED); } -void KabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException) +void KabCommonStatement::getNextParameter(OUString &) const { lcl_throwError(STR_PARA_ONLY_PREPARED); } -KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException) +KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const { if (pParseNode->count() == 3) { @@ -232,7 +232,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse return nullptr; } -KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException) +KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const { if (SQL_ISRULE(pParseNode, ordering_spec_commalist)) { @@ -291,7 +291,7 @@ bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const return true; } -void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::setKabFields(KabResultSet *pResult) const { ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns @@ -303,7 +303,7 @@ void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLExce pResult->getKabMetaData()->setKabFields(xColumns); } -void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::selectAddressees(KabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -328,7 +328,7 @@ void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQL pResult->allKabAddressees(); } -void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::sortAddressees(KabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -345,7 +345,7 @@ void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLEx } } -Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) { Any aRet = KabCommonStatement_BASE::queryInterface(rType); if (!aRet.hasValue()) @@ -353,7 +353,7 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt return aRet; } -Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), @@ -362,7 +362,7 @@ Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeExceptio return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes()); } -void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL KabCommonStatement::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -370,7 +370,7 @@ void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException, std::except // cancel the current sql statement } -void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -381,7 +381,7 @@ void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException } sal_Bool SAL_CALL KabCommonStatement::execute( - const OUString& sql ) throw(SQLException, RuntimeException, std::exception) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -392,7 +392,7 @@ sal_Bool SAL_CALL KabCommonStatement::execute( } Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( - const OUString& sql ) throw(SQLException, RuntimeException, std::exception) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -430,7 +430,7 @@ Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( return xRS; } -Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -439,7 +439,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQ return m_pConnection; } -sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -448,7 +448,7 @@ sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQ return 0; } -Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -456,7 +456,7 @@ Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeExce return makeAny(m_aLastWarning); } -void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -504,14 +504,14 @@ sal_Bool KabCommonStatement::convertFastPropertyValue( Any &, Any &, sal_Int32, - const Any&) throw (css::lang::IllegalArgumentException) + const Any&) { bool bConverted = false; // here we have to try to convert return bConverted; } -void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception, std::exception) +void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) { // set the value to whatever is necessary switch (nHandle) @@ -560,7 +560,7 @@ void SAL_CALL KabCommonStatement::release() throw() KabCommonStatement_BASE::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index e76522ceb206..197b938f4266 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -60,13 +60,13 @@ namespace connectivity protected: class KabCondition *analyseWhereClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; class KabOrder *analyseOrderByClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; bool isTableKnown(class KabResultSet *pResult) const; - void setKabFields(class KabResultSet *pResult) const throw(css::sdbc::SQLException); - void selectAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException); - void sortAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException); + void setKabFields(class KabResultSet *pResult) const; + void selectAddressees(KabResultSet *pResult) const; + void sortAddressees(KabResultSet *pResult) const; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; @@ -77,17 +77,17 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; using OPropertySetHelper::getFastPropertyValue; - virtual void resetParameters() const throw(css::sdbc::SQLException); - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException); + virtual void resetParameters() const; + virtual void getNextParameter(OUString &rParameter) const; virtual ~KabCommonStatement() override; public: @@ -104,39 +104,39 @@ namespace connectivity virtual void SAL_CALL acquire() throw() override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual sal_Int32 SAL_CALL executeUpdate( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual sal_Bool SAL_CALL execute( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; // XWarningsSupplier virtual css::uno::Any SAL_CALL getWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; virtual void SAL_CALL clearWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; // XCancellable virtual void SAL_CALL cancel( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XCloseable virtual void SAL_CALL close( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; }; diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 6d725e6101e8..d84601f44d89 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -66,7 +66,7 @@ sdbcx::ObjectType KabTables::createObject(const OUString& _rName) return xRet; } -void KabTables::impl_refresh( ) throw(RuntimeException) +void KabTables::impl_refresh( ) { static_cast<KabCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index 5a9c9ad2a927..564ca3faba52 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -33,7 +33,7 @@ namespace connectivity protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: KabTables( diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx index 5801a454a062..3721585e3109 100644 --- a/connectivity/source/drivers/kab/kcondition.cxx +++ b/connectivity/source/drivers/kab/kcondition.cxx @@ -50,7 +50,7 @@ bool KabConditionConstant::eval(const ::KABC::Addressee &) const return m_bValue; } -KabConditionColumn::KabConditionColumn(const OUString &sColumnName) throw(SQLException) +KabConditionColumn::KabConditionColumn(const OUString &sColumnName) : KabCondition(), m_nFieldNumber(findKabField(sColumnName)) { @@ -68,7 +68,7 @@ bool KabConditionColumn::isAlwaysFalse() const return false; } -KabConditionNull::KabConditionNull(const OUString &sColumnName) throw(SQLException) +KabConditionNull::KabConditionNull(const OUString &sColumnName) : KabConditionColumn(sColumnName) { } @@ -82,7 +82,7 @@ bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const // But it might do it someday } -KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) throw(SQLException) +KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) : KabConditionColumn(sColumnName) { } @@ -96,13 +96,13 @@ bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const // But it might do it someday } -KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString) : KabConditionColumn(sColumnName), m_sMatchString(sMatchString) { } -KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString) : KabConditionCompare(sColumnName, sMatchString) { } @@ -121,7 +121,7 @@ bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const return sValue == m_sMatchString; } -KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString) : KabConditionCompare(sColumnName, sMatchString) { } @@ -136,7 +136,7 @@ bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const return sValue != m_sMatchString; } -KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString) : KabConditionCompare(sColumnName, sMatchString) { } diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index a6b1cd8808b6..5225ffa573b4 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -59,7 +59,7 @@ class KabConditionColumn : public KabCondition public: explicit KabConditionColumn( - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool isAlwaysTrue() const override; virtual bool isAlwaysFalse() const override; }; @@ -68,7 +68,7 @@ class KabConditionNull : public KabConditionColumn { public: explicit KabConditionNull( - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -76,7 +76,7 @@ class KabConditionNotNull : public KabConditionColumn { public: explicit KabConditionNotNull( - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -88,7 +88,7 @@ class KabConditionCompare : public KabConditionColumn public: KabConditionCompare( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); }; class KabConditionEqual : public KabConditionCompare @@ -96,7 +96,7 @@ class KabConditionEqual : public KabConditionCompare public: KabConditionEqual( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -105,7 +105,7 @@ class KabConditionDifferent : public KabConditionCompare public: KabConditionDifferent( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -114,7 +114,7 @@ class KabConditionSimilar : public KabConditionCompare public: KabConditionSimilar( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx index 0ecc78ae5c23..e86ea64efa4d 100644 --- a/connectivity/source/drivers/kab/kfields.cxx +++ b/connectivity/source/drivers/kab/kfields.cxx @@ -47,7 +47,7 @@ QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNum } // search the KDE address book field number of a given column name -sal_uInt32 findKabField(const OUString& columnName) throw(SQLException) +sal_uInt32 findKabField(const OUString& columnName) { QString aQtName; OUString aName; diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index 9b3a9273188b..02121deaf5c9 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.hxx @@ -32,7 +32,7 @@ namespace connectivity namespace kab { QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber); - sal_uInt32 findKabField(const OUString& columnName) throw(css::sdbc::SQLException); + sal_uInt32 findKabField(const OUString& columnName); } } diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 8af97351e022..91bec0a78a78 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -85,7 +85,7 @@ const OUString& MacabCatalog::getDot() // XTablesSupplier -Reference< XNameAccess > SAL_CALL MacabCatalog::getTables( ) throw(RuntimeException) +Reference< XNameAccess > SAL_CALL MacabCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index d893d3d283a7..cf79a19ea889 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -47,7 +47,7 @@ namespace connectivity // XTablesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( - ) throw(css::uno::RuntimeException) override; + ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index f74f952d88cd..df09ef9c7715 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -78,7 +78,7 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName) return xRet; } -void MacabColumns::impl_refresh() throw(RuntimeException) +void MacabColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index d2c7f502e2dc..45858d44657e 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity MacabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: MacabColumns( MacabTable* _pTable, diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index 7b1d8dfc93bd..b966538b15e4 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.cxx @@ -59,7 +59,7 @@ void SAL_CALL MacabConnection::release() throw() release_ChildImpl(); } -void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException) +void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) { osl_atomic_increment( &m_refCount ); @@ -70,7 +70,7 @@ void MacabConnection::construct(const OUString&, const Sequence< PropertyValue > } // XServiceInfo -Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -82,7 +82,7 @@ Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) throw(SQLE return xReturn; } -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( cons return xReturn; } -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -103,7 +103,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUS return nullptr; } -OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -111,14 +111,14 @@ OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLE return _sSql; } -void SAL_CALL MacabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setAutoCommit( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); // here you have to set your commit mode please have a look at the jdbc documentation to get a clear explanation } -sal_Bool SAL_CALL MacabConnection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -128,7 +128,7 @@ sal_Bool SAL_CALL MacabConnection::getAutoCommit( ) throw(SQLException, Runtime return true; } -void SAL_CALL MacabConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -136,7 +136,7 @@ void SAL_CALL MacabConnection::commit( ) throw(SQLException, RuntimeException) // when you database does support transactions you should commit here } -void SAL_CALL MacabConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -144,7 +144,7 @@ void SAL_CALL MacabConnection::rollback( ) throw(SQLException, RuntimeException // same as commit but for the other case } -sal_Bool SAL_CALL MacabConnection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -152,7 +152,7 @@ sal_Bool SAL_CALL MacabConnection::isClosed( ) throw(SQLException, RuntimeExcep return MacabConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -169,7 +169,7 @@ Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData( ) throw(S return xMetaData; } -void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -177,7 +177,7 @@ void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runti // set you connection to readonly } -sal_Bool SAL_CALL MacabConnection::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -186,7 +186,7 @@ sal_Bool SAL_CALL MacabConnection::isReadOnly( ) throw(SQLException, RuntimeExc return false; } -void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setCatalog( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -194,7 +194,7 @@ void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, // if your database doesn't work with catalogs you go to next method otherwise you know what to do } -OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -204,7 +204,7 @@ OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeExc return OUString(); } -void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -213,7 +213,7 @@ void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExc // please have a look at @see com.sun.star.sdbc.TransactionIsolation } -sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -223,7 +223,7 @@ sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation( ) throw(SQLExcepti return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -233,13 +233,13 @@ Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( return nullptr; } -void SAL_CALL MacabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) { // the other way around } // XCloseable -void SAL_CALL MacabConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -249,13 +249,13 @@ void SAL_CALL MacabConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL MacabConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL MacabConnection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL MacabConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::clearWarnings( ) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 0c225861275a..93d395a28d0f 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -66,14 +66,11 @@ namespace connectivity public: /// @throws css::sdbc::SQLException - virtual void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException); + virtual void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info); explicit MacabConnection(MacabDriver* _pDriver); virtual ~MacabConnection() override; - /// @throws css::sdbc::SQLException - void closeAllStatements () throw( css::sdbc::SQLException); - // OComponentHelper virtual void SAL_CALL disposing() override; @@ -84,31 +81,31 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // needed for the SQL interpreter css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index fa3e9c927b5a..0dbeb5a4b328 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -54,7 +54,7 @@ MacabDatabaseMetaData::~MacabDatabaseMetaData() { } -OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) { OUString aVal; if (m_bUseCatalog) @@ -64,73 +64,73 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLExcept return aVal; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxRowSize( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCatalogNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCharLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInIndex( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCursorNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxConnections( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInTable( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatementLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTableNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect( ) { // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement, // currently, the resultset/statement implementations can cope with one table only @@ -138,63 +138,63 @@ sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLExce return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithAddColumn( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithDropColumn( ) { return false; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) { OUString aVal; if (m_bUseCatalog) @@ -203,25 +203,25 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, return aVal; } -OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) { // normally this is " OUString aVal("\""); return aVal; } -OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart( ) { bool bValue = false; if (m_bUseCatalog) @@ -230,326 +230,326 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException return bValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInDataManipulation( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatements( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxSchemaNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::allTablesAreSelectable( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::isReadOnly( ) { // for the moment, we have read-only addresses, but this might change in the future return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsColumnAliasing( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedLow( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getURL( ) { // if someday we support more than the default address book, // this method should return the URL which was used to create it @@ -557,145 +557,145 @@ OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) { OUString aValue( "macab" ); return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() { OUString aValue(MACAB_DRIVER_VERSION); return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion( ) { return MACAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion( ) { return MACAB_DRIVER_VERSION_MINOR; } -OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxUserNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { switch (setType) { @@ -706,7 +706,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setTyp return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) { switch (setType) { @@ -717,62 +717,62 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::updatesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::deletesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::insertsAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection( ) { return m_xConnection.get(); } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -791,7 +791,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) throw( return xRef; } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; @@ -847,19 +847,19 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQ return xRef; } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( const Any&, const OUString&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } @@ -868,7 +868,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( const Any&, const OUString&, const OUString& tableNamePattern, - const OUString& columnNamePattern) throw(SQLException, RuntimeException) + const OUString& columnNamePattern) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; @@ -955,7 +955,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( const Any&, const OUString&, const OUString&, - const Sequence< OUString >& types) throw(SQLException, RuntimeException) + const Sequence< OUString >& types) { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -1015,20 +1015,20 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( const Any&, const OUString&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( const Any&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( - const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& table ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); Reference< XResultSet > xRef = pResult; @@ -1059,39 +1059,39 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo( const Any&, const OUString&, const OUString&, - sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) + sal_Bool, sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier( const Any&, const OUString&, const OUString&, sal_Int32, - sal_Bool ) throw(SQLException, RuntimeException) + sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } @@ -1099,12 +1099,12 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference( const Any&, const OUString&, const OUString&, const Any&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 56eb1fd3498e..3ba29cca3fc3 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -48,155 +48,155 @@ namespace connectivity // this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 8fe1333ea8a7..3b64c4c5c1e3 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -215,12 +215,12 @@ void MacabDriver::disposing() } // static ServiceInfo -OUString MacabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString MacabDriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.macab.Driver"); } -Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) { // which service is supported // for more information @see com.sun.star.sdbc.Driver @@ -229,22 +229,22 @@ Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (Run return aSNS; } -OUString SAL_CALL MacabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MacabDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -268,7 +268,6 @@ Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, con } sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -279,33 +278,33 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url ) return url == "sdbc:address:macab"; } -Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL MacabDriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDriver::getMajorVersion( ) { return MACAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL MacabDriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDriver::getMinorVersion( ) { return MACAB_DRIVER_VERSION_MINOR; } -void SAL_CALL MacabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException) +void SAL_CALL MacabDriver::queryTermination( const EventObject& ) { // nothing to do, nothing to veto } -void SAL_CALL MacabDriver::notifyTermination( const EventObject& ) throw (RuntimeException) +void SAL_CALL MacabDriver::notifyTermination( const EventObject& ) { m_aImplModule.shutdown(); } -void SAL_CALL MacabDriver::disposing( const EventObject& ) throw (RuntimeException) +void SAL_CALL MacabDriver::disposing( const EventObject& ) { // not interested in (this is the disposing of the desktop, if any) } @@ -318,7 +317,7 @@ OUString MacabDriver::impl_getConfigurationSettingsPath() return aPath.makeStringAndClear(); } -Reference< XInterface > SAL_CALL MacabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception ) +Reference< XInterface > SAL_CALL MacabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *(new MacabDriver(comphelper::getComponentContext(_rxFactory))); } diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index e150afcac2e4..71e8c88f6a2c 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -119,13 +119,13 @@ namespace connectivity public: /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); css::uno::Reference< css::uno::XComponentContext > const & getComponentContext() const { return m_xContext; } @@ -141,23 +141,23 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion() override; + virtual sal_Int32 SAL_CALL getMinorVersion() override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: /** shuts down the library which contains the real implementations diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 2b4cbd01271a..e7e770d2a8fe 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(MacabPreparedStatement, "com.sun.star.sdbc.drivers.MacabPreparedStatement", "com.sun.star.sdbc.PreparedStatement"); -void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException) +void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) { if ( !m_aParameterRow.is() ) m_aParameterRow = new OValueVector(); @@ -46,7 +46,7 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S (m_aParameterRow->get()).resize(nParams); } -void MacabPreparedStatement::setMacabFields() const throw(SQLException) +void MacabPreparedStatement::setMacabFields() const { ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns @@ -62,12 +62,12 @@ void MacabPreparedStatement::setMacabFields() const throw(SQLException) m_xMetaData->setMacabFields(xColumns); } -void MacabPreparedStatement::resetParameters() const throw(SQLException) +void MacabPreparedStatement::resetParameters() const { m_nParameterIndex = 0; } -void MacabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException) +void MacabPreparedStatement::getNextParameter(OUString &rParameter) const { if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { @@ -110,7 +110,7 @@ void MacabPreparedStatement::disposing() } } -Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -135,7 +135,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() t return xMetaData; } -void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::close() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -153,7 +153,7 @@ void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeExcepti // list } -sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabPreparedStatement::execute() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -163,7 +163,7 @@ sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeE return xRS.is(); } -sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -172,7 +172,7 @@ sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, R return 0; } -Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -180,7 +180,7 @@ Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw( return m_pConnection; } -Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -190,7 +190,7 @@ Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQ return rs; } -void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -200,47 +200,47 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 (m_aParameterRow->get())[parameterIndex - 1].setNull(); } -void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", nullptr); } -void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) { ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", nullptr); } -void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) { ::dbtools::throwFunctionNotSupportedSQLException("setByte", nullptr); } -void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) { ::dbtools::throwFunctionNotSupportedSQLException("setShort", nullptr); } -void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setInt", nullptr); } -void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) { ::dbtools::throwFunctionNotSupportedSQLException("setLong", nullptr); } -void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) { ::dbtools::throwFunctionNotSupportedSQLException("setFloat", nullptr); } -void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) { ::dbtools::throwFunctionNotSupportedSQLException("setDouble", nullptr); } -void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -250,38 +250,38 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const (m_aParameterRow->get())[parameterIndex - 1] = x; } -void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBytes", nullptr); } -void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) { ::dbtools::throwFunctionNotSupportedSQLException("setDate", nullptr); } -void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const css::util::Time&) { ::dbtools::throwFunctionNotSupportedSQLException("setTime", nullptr); } -void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) { ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", nullptr); } -void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", nullptr); } -void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", nullptr); } -void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -293,37 +293,37 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const } } -void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", nullptr); } -void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) { ::dbtools::throwFunctionNotSupportedSQLException("setRef", nullptr); } -void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBlob", nullptr); } -void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setClob", nullptr); } -void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) { ::dbtools::throwFunctionNotSupportedSQLException("setArray", nullptr); } -void SAL_CALL MacabPreparedStatement::clearParameters() throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::clearParameters() { ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", nullptr); } -void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch (nHandle) { diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 312326edef23..a37c1b29a8a4 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx @@ -48,17 +48,17 @@ namespace connectivity OValueRow m_aParameterRow; /// @throws css::sdbc::SQLException - void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException); + void checkAndResizeParameters(sal_Int32 nParams); /// @throws css::sdbc::SQLException - void setMacabFields() const throw(css::sdbc::SQLException); + void setMacabFields() const; protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception) override; + const css::uno::Any& rValue) override; - virtual void resetParameters() const throw(css::sdbc::SQLException) override; - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override; + virtual void resetParameters() const override; + virtual void getNextParameter(OUString &rParameter) const override; virtual ~MacabPreparedStatement() override; public: @@ -73,41 +73,41 @@ namespace connectivity using MacabCommonStatement::executeUpdate; using MacabCommonStatement::execute; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index e0e09aea6a9d..505208f1b6f6 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -147,7 +147,7 @@ m_xStatement.clear(); m_xMetaData.clear(); } -Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) throw(RuntimeException) +Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) { Any aRet = OPropertySetHelper::queryInterface(rType); if (!aRet.hasValue()) @@ -165,7 +165,7 @@ void SAL_CALL MacabResultSet::release() throw() MacabResultSet_BASE::release(); } -Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException) +Sequence< Type > SAL_CALL MacabResultSet::getTypes() { OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), @@ -175,12 +175,12 @@ Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException) return comphelper::concatSequences(aTypes.getTypes(), MacabResultSet_BASE::getTypes()); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -202,7 +202,7 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw( return 0; // Never reached } -OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -229,7 +229,7 @@ OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLExce return aRet; } -sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -239,7 +239,7 @@ sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, Runt return false; } -sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -250,7 +250,7 @@ sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, Runtime return nRet; } -sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -261,7 +261,7 @@ sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, Runti return nRet; } -sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -290,7 +290,7 @@ sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLExcept return nRet; } -sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -319,7 +319,7 @@ sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLExcep return nRet; } -float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -348,7 +348,7 @@ float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLExceptio return nVal; } -double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -377,7 +377,7 @@ double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLExcept return nVal; } -Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -387,7 +387,7 @@ Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLExcep return Sequence< sal_Int8 >(); } -Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException) +Date SAL_CALL MacabResultSet::getDate(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -398,7 +398,7 @@ Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeExce return aRet; } -Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException) +Time SAL_CALL MacabResultSet::getTime(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -409,7 +409,7 @@ Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeExce return nRet; } -DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -436,7 +436,7 @@ DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLE return nRet; } -Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -446,7 +446,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) th return nullptr; } -Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -456,7 +456,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) return nullptr; } -Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException) +Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -466,7 +466,7 @@ Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::containe return Any(); } -Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -476,7 +476,7 @@ Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException, return nullptr; } -Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -486,7 +486,7 @@ Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLExceptio return nullptr; } -Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -496,7 +496,7 @@ Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLExceptio return nullptr; } -Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -506,7 +506,7 @@ Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLExcept return nullptr; } -Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -518,7 +518,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQL return xMetaData; } -sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -529,7 +529,7 @@ sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeExc return false; } -sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isAfterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -541,7 +541,7 @@ sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeExcep return false; } -sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -552,7 +552,7 @@ sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException return false; } -sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -564,7 +564,7 @@ sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException) return false; } -void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::beforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -573,7 +573,7 @@ void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException m_nRowPos = -1; } -void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::afterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -583,7 +583,7 @@ void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException) m_nRowPos = nRecords; } -void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::close() { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -592,7 +592,7 @@ void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException) dispose(); } -sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::first() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException) return true; } -sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::last() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -618,7 +618,7 @@ sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException) return true; } -sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::getRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -626,7 +626,7 @@ sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException return m_nRowPos; } -sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -640,7 +640,7 @@ sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, Ru return true; } -sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -648,7 +648,7 @@ sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, Ru return absolute(m_nRowPos + row); } -sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::next() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -656,7 +656,7 @@ sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException) return absolute(m_nRowPos + 1); } -sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::previous() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -664,7 +664,7 @@ sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeExceptio return absolute(m_nRowPos - 1); } -Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL MacabResultSet::getStatement() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -673,7 +673,7 @@ Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLExcepti return xStatement; } -sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::rowDeleted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -681,7 +681,7 @@ sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeExcept return false; } -sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::rowInserted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -689,7 +689,7 @@ sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeExcep return false; } -sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::rowUpdated() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -697,7 +697,7 @@ sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeExcept return false; } -sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::wasNull() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -705,22 +705,22 @@ sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException return m_bWasNull; } -void SAL_CALL MacabResultSet::cancel() throw(RuntimeException) +void SAL_CALL MacabResultSet::cancel() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::clearWarnings() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::clearWarnings() { } -Any SAL_CALL MacabResultSet::getWarnings() throw(SQLException, RuntimeException) +Any SAL_CALL MacabResultSet::getWarnings() { return Any(); } -void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::insertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -728,7 +728,7 @@ void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException) // you only have to implement this if you want to insert new rows } -void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -736,19 +736,19 @@ void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException) // only when you allow updates } -void SAL_CALL MacabResultSet::deleteRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::deleteRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::cancelRowUpdates() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::moveToInsertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -756,122 +756,122 @@ void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcep // only when you allow inserts } -void SAL_CALL MacabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::moveToCurrentRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateNull(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateBoolean(sal_Int32, sal_Bool) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateByte(sal_Int32, sal_Int8) { checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL MacabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateShort(sal_Int32, sal_Int16) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateInt(sal_Int32, sal_Int32) { checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL MacabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateLong(sal_Int32, sal_Int64) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateFloat(sal_Int32, float) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateTime(sal_Int32, const css::util::Time&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateTimestamp(sal_Int32, const DateTime&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::refreshRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::refreshRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateObject(sal_Int32, const Any&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } // XRowLocate -Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException, RuntimeException) +Any SAL_CALL MacabResultSet::getBookmark() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -892,7 +892,7 @@ Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException, RuntimeExceptio return Any(); } -sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -919,7 +919,7 @@ sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) throw( SQ return false; } -sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -940,7 +940,7 @@ sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const Any& bookmark, s return false; } -sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -955,12 +955,12 @@ sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const return CompareBookmark::EQUAL; } -sal_Bool SAL_CALL MacabResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::hasOrderedBookmarks() { return false; } -sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -971,7 +971,7 @@ sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) throw( SQL } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const Sequence< Any >&) throw( SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const Sequence< Any >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -1015,7 +1015,6 @@ sal_Bool MacabResultSet::convertFastPropertyValue( Any &, sal_Int32 nHandle, const Any& ) - throw (css::lang::IllegalArgumentException) { switch (nHandle) { @@ -1036,7 +1035,6 @@ sal_Bool MacabResultSet::convertFastPropertyValue( void MacabResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& ) - throw (Exception) { switch (nHandle) { diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 086588554fed..418a66c1f5b6 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -76,12 +76,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -108,110 +106,110 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 3436e3df0349..65ff01364635 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -41,7 +41,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData() { } -void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException) +void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) { OSQLColumns::Vector::const_iterator aIter; static const char aName[] = "Name"; @@ -70,13 +70,13 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity: } -sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 /* column */) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 /* column */) { // For now, all columns are the same size. return 50; } -sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) { MacabRecords *aRecords; MacabHeader *aHeader; @@ -102,22 +102,22 @@ sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw return ABTypeToDataType(aField->type); } -sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnCount() { return m_aMacabFields.size(); } -sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) { return true; } -OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) { sal_uInt32 nFieldNumber = m_aMacabFields[column - 1]; MacabRecords *aRecords; @@ -137,77 +137,77 @@ OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw( return aName; } -OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) { return m_sTableName; } -OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) { return OUString(); } -sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) { return false; } -sal_Bool SAL_CALL MacabResultSetMetaData::isAutoIncrement(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isAutoIncrement(sal_Int32) { return false; } -sal_Bool SAL_CALL MacabResultSetMetaData::isSigned(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isSigned(sal_Int32) { return false; } -sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32) { return 0; } -sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) { return 0; } -sal_Int32 SAL_CALL MacabResultSetMetaData::isNullable(sal_Int32) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::isNullable(sal_Int32) { return (sal_Int32) true; } -sal_Bool SAL_CALL MacabResultSetMetaData::isSearchable(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isSearchable(sal_Int32) { return true; } -sal_Bool SAL_CALL MacabResultSetMetaData::isReadOnly(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isReadOnly(sal_Int32) { return true; } -sal_Bool SAL_CALL MacabResultSetMetaData::isDefinitelyWritable(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isDefinitelyWritable(sal_Int32) { return false; } -sal_Bool SAL_CALL MacabResultSetMetaData::isWritable(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isWritable(sal_Int32) { return false; } diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index cc7ccf38b36c..ac795313484a 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -55,31 +55,31 @@ namespace connectivity /// @throws css::sdbc::SQLException void setMacabFields( - const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException); + const ::rtl::Reference<connectivity::OSQLColumns> &xColumns); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aMacabFields[columnIndex - 1]; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 40b0397d63b9..721bbe36c087 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -72,16 +72,16 @@ MacabCommonStatement::~MacabCommonStatement() { } -void MacabCommonStatement::resetParameters() const throw(css::sdbc::SQLException) +void MacabCommonStatement::resetParameters() const { } -void MacabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException) +void MacabCommonStatement::getNextParameter(OUString &) const { impl_throwError(STR_PARA_ONLY_PREPARED); } -MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException) +MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const { if (pParseNode->count() == 3) { @@ -226,7 +226,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP return nullptr; } -MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException) +MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const { if (SQL_ISRULE(pParseNode, ordering_spec_commalist)) { @@ -286,7 +286,7 @@ OUString MacabCommonStatement::getTableName() const return xTabs.begin()->first; } -void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(SQLException) +void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const { ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns MacabResultSetMetaData *pMeta; // meta information - holds the list of AddressBook fields @@ -304,7 +304,7 @@ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(S pMeta->setMacabFields(xColumns); } -void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQLException) +void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -329,7 +329,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ pResult->allMacabRecords(); } -void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLException) +void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -346,7 +346,7 @@ void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLE } } -Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) { Any aRet = MacabCommonStatement_BASE::queryInterface(rType); if (!aRet.hasValue()) @@ -354,7 +354,7 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru return aRet; } -Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), @@ -363,7 +363,7 @@ Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) throw(RuntimeExcept return comphelper::concatSequences(aTypes.getTypes(),MacabCommonStatement_BASE::getTypes()); } -void SAL_CALL MacabCommonStatement::cancel( ) throw(RuntimeException) +void SAL_CALL MacabCommonStatement::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -371,7 +371,7 @@ void SAL_CALL MacabCommonStatement::cancel( ) throw(RuntimeException) // cancel the current sql statement } -void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -382,7 +382,7 @@ void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeExcepti } sal_Bool SAL_CALL MacabCommonStatement::execute( - const OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -393,7 +393,7 @@ sal_Bool SAL_CALL MacabCommonStatement::execute( } Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery( - const OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -450,7 +450,7 @@ Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery( return xRS; } -Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -459,7 +459,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw( return m_pConnection; } -sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -468,7 +468,7 @@ sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw( return 0; } -Any SAL_CALL MacabCommonStatement::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL MacabCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -476,7 +476,7 @@ Any SAL_CALL MacabCommonStatement::getWarnings( ) throw(SQLException, RuntimeEx return makeAny(m_aLastWarning); } -void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -524,14 +524,14 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue( Any &, Any &, sal_Int32, - const Any&) throw (css::lang::IllegalArgumentException) + const Any&) { bool bConverted = false; // here we have to try to convert return bConverted; } -void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception) +void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) { // set the value to whatever is necessary switch (nHandle) @@ -580,7 +580,7 @@ void SAL_CALL MacabCommonStatement::release() throw() MacabCommonStatement_BASE::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo( ) throw(RuntimeException) +Reference< css::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 0d2f4c2e9664..ff80b2b4bf79 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -66,17 +66,17 @@ namespace connectivity protected: /// @throws css::sdbc::SQLException class MacabCondition *analyseWhereClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; /// @throws css::sdbc::SQLException class MacabOrder *analyseOrderByClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; OUString getTableName( ) const; /// @throws css::sdbc::SQLException - void setMacabFields(class MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void setMacabFields(class MacabResultSet *pResult) const; /// @throws css::sdbc::SQLException - void selectRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void selectRecords(MacabResultSet *pResult) const; /// @throws css::sdbc::SQLException - void sortRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void sortRecords(MacabResultSet *pResult) const; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; @@ -87,18 +87,18 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; /// @throws css::sdbc::SQLException - virtual void resetParameters() const throw(css::sdbc::SQLException); + virtual void resetParameters() const; /// @throws css::sdbc::SQLException - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const; virtual ~MacabCommonStatement() override; public: @@ -115,39 +115,39 @@ namespace connectivity virtual void SAL_CALL acquire() throw() override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - ) throw(css::uno::RuntimeException) override; + ) override; // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + const OUString& sql ) override; virtual sal_Int32 SAL_CALL executeUpdate( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + const OUString& sql ) override; virtual sal_Bool SAL_CALL execute( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + const OUString& sql ) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; // XWarningsSupplier virtual css::uno::Any SAL_CALL getWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; virtual void SAL_CALL clearWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; // XCancellable virtual void SAL_CALL cancel( - ) throw(css::uno::RuntimeException) override; + ) override; // XCloseable virtual void SAL_CALL close( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; // other methods inline MacabConnection* getOwnConnection() const { return m_pConnection; } diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index a97c034df9d1..5a6e37927365 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -66,7 +66,7 @@ sdbcx::ObjectType MacabTables::createObject(const OUString& _rName) return xRet; } -void MacabTables::impl_refresh( ) throw(RuntimeException) +void MacabTables::impl_refresh( ) { static_cast<MacabCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 926eec0d0370..849e3e0f2634 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -33,7 +33,7 @@ namespace connectivity protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: MacabTables( diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index c0f10a77b79f..0d1d20227a42 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.cxx @@ -51,7 +51,7 @@ bool MacabConditionConstant::eval(const MacabRecord *) const return m_bValue; } -MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) +MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) : MacabCondition(), m_nFieldNumber(header->getColumnNumber(sColumnName)) { @@ -69,7 +69,7 @@ bool MacabConditionColumn::isAlwaysFalse() const return false; } -MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) +MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) : MacabConditionColumn(header, sColumnName) { } @@ -86,7 +86,7 @@ bool MacabConditionNull::eval(const MacabRecord *aRecord) const return false; } -MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) +MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) : MacabConditionColumn(header, sColumnName) { } @@ -103,13 +103,13 @@ bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const return true; } -MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionColumn(header, sColumnName), m_sMatchString(sMatchString) { } -MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -132,7 +132,7 @@ bool MacabConditionEqual::eval(const MacabRecord *aRecord) const return nReturn == 0; } -MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -155,7 +155,7 @@ bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const return nReturn != 0; } -MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionCompare(header, sColumnName, sMatchString) { } diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 24a5a32c57cc..3f6ce867a801 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -61,7 +61,7 @@ class MacabConditionColumn : public MacabCondition /// @throws css::sdbc::SQLException MacabConditionColumn( const MacabHeader *header, - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool isAlwaysTrue() const override; virtual bool isAlwaysFalse() const override; }; @@ -72,7 +72,7 @@ class MacabConditionNull : public MacabConditionColumn /// @throws css::sdbc::SQLException MacabConditionNull( const MacabHeader *header, - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -82,7 +82,7 @@ class MacabConditionNotNull : public MacabConditionColumn /// @throws css::sdbc::SQLException MacabConditionNotNull( const MacabHeader *header, - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -96,7 +96,7 @@ class MacabConditionCompare : public MacabConditionColumn MacabConditionCompare( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); }; class MacabConditionEqual : public MacabConditionCompare @@ -106,7 +106,7 @@ class MacabConditionEqual : public MacabConditionCompare MacabConditionEqual( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -117,7 +117,7 @@ class MacabConditionDifferent : public MacabConditionCompare MacabConditionDifferent( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -128,7 +128,7 @@ class MacabConditionSimilar : public MacabConditionCompare MacabConditionSimilar( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const MacabRecord *aRecord) const override; }; diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index d8b81ef270cd..c9f8d759b17b 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -76,7 +76,7 @@ void OCatalog::refreshUsers() // XTablesSupplier -Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx index 5f4b8245369f..5f5f817e78c8 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -38,7 +38,7 @@ namespace connectivity virtual void refreshViews() override ; virtual void refreshGroups() override; virtual void refreshUsers() override ; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; public: explicit OCatalog(OConnection* _pCon); diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx index 8691376d1d70..b5f791f2bbb4 100644 --- a/connectivity/source/drivers/mork/MColumns.cxx +++ b/connectivity/source/drivers/mork/MColumns.cxx @@ -71,7 +71,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) } -void OColumns::impl_refresh() throw(RuntimeException) +void OColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx index b49d0266c8d0..4f828ead53f4 100644 --- a/connectivity/source/drivers/mork/MColumns.hxx +++ b/connectivity/source/drivers/mork/MColumns.hxx @@ -35,7 +35,7 @@ namespace connectivity OTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OColumns( OTable* _pTable, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 4a58a4ed257e..3dd4b2bef429 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -61,7 +61,7 @@ void SAL_CALL OConnection::release() throw() } -void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) { (void) info; // avoid warnings SAL_INFO("connectivity.mork", "=> OConnection::construct()" ); @@ -176,7 +176,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mork.OConnection", "com.sun.star.sdbc.Connection") -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { SAL_INFO("connectivity.mork", "=> OConnection::createStatement()" ); @@ -190,7 +190,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) { SAL_INFO("connectivity.mork", "=> OConnection::prepareStatement()" ); SAL_INFO("connectivity.mork", "OConnection::prepareStatement( " << _sSql << " )"); @@ -209,7 +209,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) { SAL_INFO("connectivity.mork", "=> OConnection::prepareCall()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -218,7 +218,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin return nullptr; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) { SAL_INFO("connectivity.mork", "=> OConnection::nativeSQL()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -230,12 +230,12 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLExcep return _sSql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setAutoCommit", *this ); } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { // you have to distinguish which if you are in autocommit mode or not // at normal case true should be fine here @@ -243,17 +243,17 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return true; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::commit( ) { // when you database does support transactions you should commit here } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::rollback( ) { // same as commit but for the other case } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -261,7 +261,7 @@ sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { SAL_INFO("connectivity.mork", "=> OConnection::getMetaData()" ); @@ -280,51 +280,51 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setReadOnly", *this ); } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isReadOnly( ) { // return if your connection to readonly return false; } -void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::getCatalog( ) { return OUString(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { // please have a look at @see com.sun.star.sdbc.TransactionIsolation return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) { // if your driver has special database types you can return it here return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +void SAL_CALL OConnection::close( ) { // we just dispose us { @@ -336,13 +336,13 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std:: } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OConnection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::clearWarnings( ) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index d7364c3e908b..37606ea0387b 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -49,7 +49,7 @@ namespace connectivity public: /// @throws css::sdbc::SQLException - void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException); + void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info); explicit OConnection(MorkDriver* const driver); virtual ~OConnection() override; @@ -64,29 +64,29 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings() override; const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 9dfdcc364d43..5bb771428786 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -51,7 +51,7 @@ ODatabaseMetaData::~ODatabaseMetaData() ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException) + const OUString& columnNamePattern ) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getColumnRows()" ); SAL_INFO("connectivity.mork", "tableNamePattern: " << tableNamePattern); @@ -143,55 +143,55 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { sal_Int32 nValue = 65535; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { sal_Int32 nValue = 254; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { sal_Int32 nValue = 20; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; @@ -202,7 +202,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; @@ -215,17 +215,17 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } @@ -235,17 +235,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } @@ -260,18 +260,18 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { OUString aVal; return aVal; @@ -283,13 +283,13 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return OUString( "\""); } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return true; } @@ -299,58 +299,58 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { //We support create table return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) { return false; } @@ -360,22 +360,22 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } @@ -390,7 +390,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -400,55 +400,55 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { // We allow you to select from any table. return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { //we support insert/update/delete now //But we have to set this to return sal_True otherwise the UI will add create "table/edit table" @@ -456,93 +456,93 @@ sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeE return true; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { // Support added for this. return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { return true; } @@ -553,277 +553,277 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { OUString aValue = OUString::number(1); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue = OUString::number(0); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return false; } @@ -833,7 +833,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException // of course you could implement it on your and you should do this because // the general way is more memory expensive -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { // there exists no possibility to get table types so we have to check static const OUStringLiteral sTableTypes[] = @@ -908,7 +908,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -920,7 +920,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, std::exception) + const OUString& tableNamePattern, const Sequence< OUString >& /*types*/ ) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTables()" ); // this returns an empty resultset where the column-names are already set @@ -945,7 +945,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTablePrivileges()" ); ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); @@ -1003,7 +1003,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { return nullptr; } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index 10fb2c478a0e..7673227fad10 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -28,7 +28,7 @@ namespace connectivity m_pMetaDataHelper; /// @throws css::sdbc::SQLException - ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( css::sdbc::SQLException ); + ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ); protected: virtual ~ODatabaseMetaData() override; @@ -55,131 +55,131 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; }; } } diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 16180de53257..a45f149f6a33 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -29,19 +29,16 @@ MorkDriver::MorkDriver(const css::uno::Reference< css::uno::XComponentContext >& } OUString SAL_CALL MorkDriver::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString(MORK_DRIVER_IMPL_NAME); } sal_Bool SAL_CALL MorkDriver::supportsService(const OUString& serviceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return { "com.sun.star.sdbc.Driver" }; } @@ -49,7 +46,6 @@ css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames() css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> MorkDriver::connect()" ); @@ -81,7 +77,6 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( } sal_Bool MorkDriver::acceptsURL(OUString const & url) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" ); // Skip 'sdbc:mozab: part of URL @@ -119,19 +114,18 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url) css::uno::Sequence< css::sdbc::DriverPropertyInfo > MorkDriver::getPropertyInfo( OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { //... TODO (void) url; (void) info; // avoid warnings return css::uno::Sequence< css::sdbc::DriverPropertyInfo >(); } -sal_Int32 MorkDriver::getMajorVersion() throw (css::uno::RuntimeException, std::exception) { +sal_Int32 MorkDriver::getMajorVersion() { //... TODO return 0; } -sal_Int32 MorkDriver::getMinorVersion() throw (css::uno::RuntimeException, std::exception) { +sal_Int32 MorkDriver::getMinorVersion() { //... TODO return 0; } diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index e17b5ed7950d..7d598f26ab04 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -44,35 +44,28 @@ private: virtual ~MorkDriver() override {} - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( OUString const & url, - css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::beans::PropertyValue > const & info) override; virtual sal_Bool SAL_CALL acceptsURL( - OUString const & url) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + OUString const & url) override; virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( OUString const & url, - css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::beans::PropertyValue > const & info) override; - virtual sal_Int32 SAL_CALL getMajorVersion() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion() override; - virtual sal_Int32 SAL_CALL getMinorVersion() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinorVersion() override; css::uno::Reference< css::uno::XComponentContext > context_; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 51f1dd2e8e5d..82a7a3aac69c 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -57,7 +57,6 @@ void SAL_CALL OPreparedStatement::disposing() } OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , bool bAdjusted ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted ); if ( eStatementType != eSelect ) @@ -107,7 +106,7 @@ void SAL_CALL OPreparedStatement::release() throw() OCommonStatement::release(); } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement::queryInterface(rType); if(!aRet.hasValue()) @@ -115,13 +114,13 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt return aRet; } -css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -139,7 +138,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -149,14 +148,14 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::dbtools::throwFeatureNotImplementedSQLException( "XStatement::executeUpdate", *this ); return 0; } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -165,7 +164,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -174,7 +173,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -185,60 +184,60 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBoolean", *this ); } -void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setByte", *this ); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setDate", *this ); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTime", *this ); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTimestamp", *this ); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setDouble", *this ); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setFloat", *this ); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setInt", *this ); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setLong", *this ); } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -249,77 +248,77 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setObjectWithInfo", *this ); } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { ::dbtools::implSetObject(this,parameterIndex,x); } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setShort", *this ); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBytes", *this ); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBinaryStream", *this ); } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -468,17 +467,17 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< scanParameter(pParseNode->getChild(i),_rParaNodes); } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) { return nullptr; } -sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) { return 0; } -sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) { return false; } diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 3fa14ef8da0a..bb4d2772326f 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -50,15 +50,14 @@ namespace connectivity protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual ~OPreparedStatement() override; virtual void SAL_CALL disposing() override; // OCommonStatement overridables virtual StatementType - parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + parseSql( const OUString& sql , bool bAdjusted = false) override; virtual void initializeResultSet( OResultSet* _pResult ) override; virtual void clearCachedResultSet() override; virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) override; @@ -80,47 +79,47 @@ namespace connectivity void lateInit(); //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; public: using OCommonStatement::executeQuery; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 7ce0643280ca..e0211c3f0993 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -48,17 +48,17 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.mork.ResultSet"); } - Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) + 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( RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -108,7 +108,7 @@ void OResultSet::disposing() m_xTable.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); if(!aRet.hasValue()) @@ -116,7 +116,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } - Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OResultSet::getTypes( ) { OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -136,7 +136,7 @@ void OResultSet::methodEntry() } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { ResultSetEntryGuard aGuard( *this ); @@ -156,18 +156,18 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ return 0; // Never reached } -Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); m_bWasNull = true; @@ -175,49 +175,49 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLE } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0; } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return Sequence< sal_Int8 >(); } -Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return Date(); } -double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0.0; } -float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0; } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0; } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ResultSetEntryGuard aGuard( *this ); @@ -226,14 +226,14 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return sal_Int64(); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ResultSetEntryGuard aGuard( *this ); @@ -243,42 +243,42 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return Any(); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) { return 0; } -void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException) +void OResultSet::checkIndex(sal_Int32 columnIndex ) { if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size()) ::dbtools::throwInvalidIndexException(*this); @@ -294,14 +294,14 @@ sal_uInt32 OResultSet::currentRowCount() } -bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException) +bool OResultSet::fetchCurrentRow( ) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return fetchRow(getCurrentCardNumber()); } -bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLException, RuntimeException) +bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) { SAL_INFO("connectivity.mork", "cardNumber = " << cardNumber); if (!bForceReload) @@ -344,7 +344,7 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLExcep } -const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) { if ( !fetchRow( cardNumber ) ) { @@ -359,7 +359,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI } -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) { ResultSetEntryGuard aGuard( *this ); @@ -373,21 +373,21 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept } -Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return Time(); } -DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return DateTime(); } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) { ResultSetEntryGuard aGuard( *this ); @@ -396,7 +396,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep return( m_nRowPos < 1 ); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) { SAL_WARN("connectivity.mork", "OResultSet::isAfterLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -405,14 +405,14 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return m_nRowPos > currentRowCount() && MQueryHelper::queryComplete(); } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isFirst( ) { ResultSetEntryGuard aGuard( *this ); return m_nRowPos == 1; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isLast( ) { SAL_WARN("connectivity.mork", "OResultSet::isLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -421,7 +421,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s return m_nRowPos == currentRowCount() && MQueryHelper::queryComplete(); } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::beforeFirst( ) { ResultSetEntryGuard aGuard( *this ); @@ -430,7 +430,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::afterLast( ) { ResultSetEntryGuard aGuard( *this ); @@ -439,61 +439,61 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st } -void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::close() { dispose(); } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::first( ) { return seekRow( FIRST_POS ); } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::last( ) { return seekRow( LAST_POS ); } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) { return seekRow( ABSOLUTE_POS, row ); } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) { return seekRow( RELATIVE_POS, row ); } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::previous( ) { ResultSetEntryGuard aGuard( *this ); return seekRow( PRIOR_POS ); } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) { ResultSetEntryGuard aGuard( *this ); return m_xStatement; } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) { SAL_WARN("connectivity.mork", "OResultSet::rowDeleted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); return true;//return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowInserted( ) { SAL_WARN("connectivity.mork", "OResultSet::rowInserted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); return true;//return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted); } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) { SAL_WARN("connectivity.mork", "OResultSet::rowUpdated() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -501,13 +501,13 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::next( ) { return seekRow( NEXT_POS ); } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::wasNull( ) { ResultSetEntryGuard aGuard( *this ); @@ -515,20 +515,20 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OResultSet::cancel( ) { } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::clearWarnings( ) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getWarnings( ) { return Any(); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::refreshRow( ) { if (fetchRow(getCurrentCardNumber(),true)) { //force fetch current row will cause we lose all change to the current row @@ -569,7 +569,6 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & /*rOldValue*/, sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (css::lang::IllegalArgumentException) { OSL_FAIL( "OResultSet::convertFastPropertyValue: not implemented!" ); switch(nHandle) @@ -590,7 +589,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (Exception, std::exception) { OSL_FAIL( "OResultSet::setFastPropertyValue_NoBroadcast: not implemented!" ); switch(nHandle) @@ -644,7 +642,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -955,7 +953,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } void OResultSet::fillRowData() - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_ENSURE( m_pStatement, "Require a statement" ); @@ -1057,9 +1054,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) return 0; } -void SAL_CALL OResultSet::executeQuery() throw(css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception) +void SAL_CALL OResultSet::executeQuery() { ResultSetEntryGuard aGuard( *this ); @@ -1451,7 +1446,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin } -css::uno::Any OResultSet::getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Any OResultSet::getBookmark( ) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); @@ -1462,7 +1457,7 @@ css::uno::Any OResultSet::getBookmark( ) throw(css::sdbc::SQLException, css::un OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row"); return makeAny((sal_Int32)(m_aRow->get())[0]); } -sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO( @@ -1472,7 +1467,7 @@ sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) throw(css: fetchCurrentRow(); return true; } -sal_Bool OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO( @@ -1482,7 +1477,7 @@ sal_Bool OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal m_nRowPos = getRowForCardNumber(nCardNum); return seekRow(RELATIVE_POS,rows ); } -sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno::Any& rhs ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno::Any& rhs ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1503,13 +1498,13 @@ sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno return nResult; } -sal_Bool OResultSet::hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool OResultSet::hasOrderedBookmarks( ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return true; } -sal_Int32 OResultSet::hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 OResultSet::hashBookmark( const css::uno::Any& bookmark ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1524,7 +1519,7 @@ sal_Int32 OResultSet::getCurrentCardNumber() return 0; return (m_pKeySet->get())[m_nRowPos-1]; } -void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) +void OResultSet::checkPendingUpdate() { OSL_FAIL( "OResultSet::checkPendingUpdate() not implemented" ); /* @@ -1542,7 +1537,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) */ } -void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException) +void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); @@ -1562,7 +1557,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); @@ -1580,72 +1575,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, std::exception) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex, static_cast<bool>(x)); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +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, std::exception) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ResultSetEntryGuard aGuard( *this ); @@ -1657,12 +1652,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { updateBinaryStream(columnIndex,x,length); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { @@ -1675,7 +1670,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th } -void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { @@ -1689,7 +1684,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& // XResultSetUpdate -void SAL_CALL OResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::insertRow( ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "in, m_nRowPos = " << m_nRowPos); @@ -1699,27 +1694,27 @@ void SAL_CALL OResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno: SAL_INFO("connectivity.mork", "out, m_nRowPos = " << m_nRowPos); } -void SAL_CALL OResultSet::updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::updateRow( ) { OSL_FAIL( "OResultSet::updateRow( ) not implemented" ); } -void SAL_CALL OResultSet::deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::deleteRow( ) { OSL_FAIL( "OResultSet::deleteRow( ) not implemented" ); } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::cancelRowUpdates( ) { OSL_FAIL( "OResultSet::cancelRowUpdates( ) not implemented" ); } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToInsertRow( ) { OSL_FAIL( "OResultSet::moveToInsertRow( ) not implemented" ); } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToCurrentRow( ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1761,7 +1756,7 @@ void OResultSet::setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrd { m_aOrderbyAscending = _aOrderbyAsc; } -Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XDeleteRows::deleteRows", *this ); return Sequence< sal_Int32 >(); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 081352aba80a..c8fc79ef5104 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -97,13 +97,11 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) - throw (css::uno::Exception, std::exception) override; + ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle @@ -119,99 +117,99 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; // XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override; protected: //MQuery m_aQuery; @@ -241,7 +239,7 @@ protected: void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void fillRowData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + void fillRowData(); void analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression); @@ -257,12 +255,10 @@ protected: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false) throw( css::sdbc::SQLException, - css::uno::RuntimeException); + bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool fetchCurrentRow() throw( css::sdbc::SQLException, - css::uno::RuntimeException); + bool fetchCurrentRow(); static bool pushCard(sal_uInt32 ) { return true; } bool validRow( sal_uInt32 nRow ); bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); @@ -271,15 +267,14 @@ protected: sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex) - throw(css::sdbc::SQLException, css::uno::RuntimeException); + const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - static void checkPendingUpdate() throw(css::sdbc::SQLException, css::uno::RuntimeException); + static void checkPendingUpdate(); sal_Int32 getCurrentCardNumber(); public: @@ -287,9 +282,7 @@ public: // MozAddressbook Specific methods /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL executeQuery() throw(css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception); + void SAL_CALL executeQuery(); void setTable(OTable* _rTable); @@ -311,7 +304,7 @@ public: inline sal_Int32 mapColumn(sal_Int32 column); /// @throws css::sdbc::SQLException - void checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException); + void checkIndex(sal_Int32 columnIndex ); static void setBoundedColumns( const OValueRow& _rRow, diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index 24990110bb57..707e51f4dd2c 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -41,43 +41,43 @@ OResultSetMetaData::~OResultSetMetaData() } -void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException) +void OResultSetMetaData::checkColumnIndex(sal_Int32 column) { if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size()) throwInvalidIndexException(*this); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { return getPrecision(column); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) { return DataType::VARCHAR; // at the moment there exists only this type } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { return static_cast<sal_Int32>((m_xColumns->get()).size()); } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) { return false; } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { checkColumnIndex(column); @@ -94,71 +94,71 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ return sColumnName; } -OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) { return m_aTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } -OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex(column); return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) { return false; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) { return false; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) { if ( !m_pTable || !m_pTable->getConnection() ) { @@ -170,7 +170,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { checkColumnIndex(column); bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && @@ -180,12 +180,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return !isReadOnly(column); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return !isReadOnly(column); } diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index 78db8d3f3bb9..1e057ef7773e 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -59,28 +59,28 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex(sal_Int32 column) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + void checkColumnIndex(sal_Int32 column); + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 14be8ae4df35..7f9ed80eb17f 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -87,7 +87,7 @@ void OCommonStatement::disposing() OCommonStatement_IBASE::disposing(); } -Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement_IBASE::queryInterface(rType); if(!aRet.hasValue()) @@ -95,7 +95,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim return aRet; } -Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), @@ -104,7 +104,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes()); } -void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -114,7 +114,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, } OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted) - throw ( SQLException, RuntimeException, std::exception ) { OUString aErr; @@ -218,7 +217,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR } -sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -229,7 +228,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce } -Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_ThreadMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -243,7 +242,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& } -Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -252,7 +251,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLE return Reference< XConnection >(m_pConnection.get()); } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = ::cppu::queryInterface(rType,static_cast< XServiceInfo*> (this)); if(!aRet.hasValue()) @@ -260,14 +259,14 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } -sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XStatement::executeUpdate", *this ); return 0; } -Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -276,7 +275,7 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -325,14 +324,13 @@ sal_Bool OCommonStatement::convertFastPropertyValue( Any & /*rOldValue*/, sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) - throw (css::lang::IllegalArgumentException) { bool bConverted = false; // here we have to try to convert return bConverted; } -void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception, std::exception) +void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) { // set the value to whatever is necessary switch(nHandle) @@ -389,7 +387,7 @@ void SAL_CALL OStatement::release() throw() OCommonStatement::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 3127bbb20a4e..ec88e19e1199 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -88,11 +88,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -109,7 +108,7 @@ namespace connectivity @throws css::uno::RuntimeException */ virtual StatementType - parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); + parseSql( const OUString& sql , bool bAdjusted = false); /** called to initialize a result set, according to a previously parsed SQL statement */ virtual void initializeResultSet( OResultSet* _pResult ); @@ -145,22 +144,22 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override ; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; protected: using OPropertySetHelper::getFastPropertyValue; @@ -176,7 +175,7 @@ namespace connectivity explicit OStatement( OConnection* _pConnection); DECLARE_SERVICE_INFO(); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; }; diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index a5164e426fe9..1bc3ad5f3d39 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -53,7 +53,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return xRet; } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast<OCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index 7a96a3d622fa..23a4b51361f6 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -30,7 +30,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index a1f073dd7dbb..505a23b1e376 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -70,17 +70,17 @@ void MozillaBootstrap::disposing() OMozillaBootstrap_BASE::disposing(); } -OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getImplementationName( ) { return OUString(MOZAB_MozillaBootstrap_IMPL_NAME); } -sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) { // which service is supported // for more information @see com.sun.star.mozilla.MozillaBootstrap @@ -89,55 +89,55 @@ Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) thr // XProfileDiscover -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( css::mozilla::MozillaProductType product) { return m_ProfileAccess->getProfileCount(product); } -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) { return m_ProfileAccess->getProfileList(product,list); } -OUString SAL_CALL MozillaBootstrap::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getDefaultProfile( css::mozilla::MozillaProductType product ) { return m_ProfileAccess->getDefaultProfile(product); } -OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) { return m_ProfileAccess->getProfilePath(product,profileName); } -sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) { return m_ProfileAccess->isProfileLocked(product,profileName); } -sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) { return m_ProfileAccess->getProfileExists(product,profileName); } // XProfileManager -::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return -1; } -::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) { return -1; } -css::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (css::uno::RuntimeException, std::exception) +css::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) { return css::mozilla::MozillaProductType_Default; } -OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) { return OUString(); } -sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) { return true; } -OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ @@ -145,7 +145,7 @@ OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProd } // XProxyRunner -::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) { (void)aCode; /* avoid warning about unused parameter */ return -1; diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 2a61d88d760b..9c75568e203f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -51,30 +51,30 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XMozillaBootstrap // XProfileDiscover - virtual ::sal_Int32 SAL_CALL getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getProfileCount( css::mozilla::MozillaProductType product) override; + virtual ::sal_Int32 SAL_CALL getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) override; + virtual OUString SAL_CALL getDefaultProfile( css::mozilla::MozillaProductType product ) override; + virtual OUString SAL_CALL getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) override; + virtual sal_Bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) override; + virtual sal_Bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) override; // XProfileManager - virtual ::sal_Int32 SAL_CALL bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentProfile( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) override; + virtual ::sal_Int32 SAL_CALL shutdownProfile( ) override; + virtual css::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) override; + virtual OUString SAL_CALL getCurrentProfile( ) override; + virtual sal_Bool SAL_CALL isCurrentProfileLocked( ) override; + virtual OUString SAL_CALL setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) override; // XProxyRunner - virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) override; }; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index f859727eef3b..15f1dd1264b6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -21,7 +21,7 @@ #include <rtl/byteseq.hxx> #include <osl/diagnose.h> -IniParser::IniParser(OUString const & rIniName) throw(css::io::IOException, std::exception) +IniParser::IniParser(OUString const & rIniName) { OUString iniUrl; if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData)) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 9b44ffb2091b..120f47121915 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -52,7 +52,7 @@ class IniParser public: IniSectionMap& getAllSection() { return mAllSection; } /// @throws css::io::IOException - explicit IniParser(OUString const & rIniName) throw(css::io::IOException, std::exception); + explicit IniParser(OUString const & rIniName); }; #endif diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index 9f4ca1c9c1c2..1adb8993fde0 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -139,7 +139,7 @@ namespace connectivity } } - OUString ProfileAccess::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) + OUString ProfileAccess::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -152,13 +152,13 @@ namespace connectivity return rProduct.mProfileList[profileName]->getProfilePath(); } - ::sal_Int32 ProfileAccess::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileCount( css::mozilla::MozillaProductType product) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } - ::sal_Int32 ProfileAccess::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -176,7 +176,7 @@ namespace connectivity return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } - OUString ProfileAccess::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException) + OUString ProfileAccess::getDefaultProfile( css::mozilla::MozillaProductType product ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -193,14 +193,14 @@ namespace connectivity ProfileStruct * aProfile = (*rProduct.mProfileList.begin()).second; return aProfile->getProfileName(); } - bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) + bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return true; } - bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) + bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index 8de3f03d8e6b..8bd1021bf343 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -71,17 +71,17 @@ namespace connectivity ~ProfileAccess(); ProfileAccess(); /// @throws css::uno::RuntimeException - OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ); /// @throws css::uno::RuntimeException - ::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException); + ::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product ); /// @throws css::uno::RuntimeException - ::sal_Int32 getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException); + ::sal_Int32 getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ); /// @throws css::uno::RuntimeException - OUString getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException); + OUString getDefaultProfile( css::mozilla::MozillaProductType product ); /// @throws css::uno::RuntimeException - bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ); /// @throws css::uno::RuntimeException - bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ); private: ProductStruct m_ProductProfileList[4]; void LoadProductsInfo(); diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index c98890c5f6d3..6d9e1c1b865c 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -112,7 +112,7 @@ void OMySQLCatalog::refreshUsers() m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this); } -Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) { if ( rType == cppu::UnoType<XGroupsSupplier>::get()) return Any(); @@ -121,7 +121,7 @@ Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeEx return OCatalog::queryInterface(rType); } -Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) { Sequence< Type > aTypes = OCatalog::getTypes(); ::std::vector<Type> aOwnTypes; diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx index 2864f5b92231..d8e0b75e3ce7 100644 --- a/connectivity/source/drivers/mysql/YColumns.cxx +++ b/connectivity/source/drivers/mysql/YColumns.cxx @@ -67,7 +67,7 @@ void OMySQLColumn::construct() return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } -Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) { Sequence< OUString > aSupported { "com.sun.star.sdbcx.Column" }; diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 3655fa4f5a3d..491dd7a0d72e 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -44,7 +44,7 @@ namespace connectivity namespace mysql { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) + Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) { return *(new ODriverDelegator( comphelper::getComponentContext(_rxFac) )); } @@ -248,7 +248,7 @@ namespace connectivity } - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -310,7 +310,7 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) { Sequence< PropertyValue > info; @@ -323,7 +323,7 @@ namespace connectivity } - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) { ::std::vector< DriverPropertyInfo > aDriverInfo; if ( !acceptsURL(url) ) @@ -381,19 +381,19 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) { return 1; } - sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) { return 0; } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed); @@ -443,7 +443,7 @@ namespace connectivity } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) { @@ -458,12 +458,12 @@ namespace connectivity // XServiceInfo - OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) + OUString ODriverDelegator::getImplementationName_Static( ) { return OUString("org.openoffice.comp.drivers.MySQL.Driver"); } - Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -471,17 +471,17 @@ namespace connectivity return aSNS; } - OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 667e48af3c89..a83c82639559 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -162,7 +162,7 @@ Sequence< sal_Int8 > OMySQLTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -170,7 +170,7 @@ sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R } // XAlterTable -void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index 3cad5360c033..a05bb0028873 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -93,7 +93,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return xRet; } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast<OMySQLCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index e386d9b385ed..977b5bb0ea50 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() } typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER; -sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 return nRights; } -void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) +void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) { nRightsWithGrant = nRights = 0; // first we need to create the sql stmt to select the privs @@ -192,7 +192,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_I } } -sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, return nRightsWithGrant; } -void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -228,7 +228,7 @@ void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 ob } } -void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -255,7 +255,7 @@ void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 o } // XUser -void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index 834c9461ff9a..db24a1d38976 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -54,7 +54,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName) return new OMySQLUser(m_xConnection,_rName); } -void OUsers::impl_refresh() throw(RuntimeException) +void OUsers::impl_refresh() { m_pParent->refreshUsers(); } diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index 0e45831c7ad2..db8619d7e287 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -66,7 +66,7 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName) ); } -void OViews::impl_refresh( ) throw(RuntimeException) +void OViews::impl_refresh( ) { static_cast<OMySQLCatalog&>(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 9e0b3d1eb374..eb8d58547650 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -176,7 +176,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi return nSQLRETURN; } -SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException, std::exception) +SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info) { m_aConnectionHandle = SQL_NULL_HANDLE; m_sURL = url; @@ -268,7 +268,7 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.odbc.OConnection", "com.sun.star.sdbc.Connection") -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -278,7 +278,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -288,13 +288,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -305,7 +305,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLExcepti return OUString(pOut,nOutLen,getTextEncoding()); } -void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -317,7 +317,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -329,7 +329,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return nOption == SQL_AUTOCOMMIT_ON ; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -338,7 +338,7 @@ void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std: OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_COMMIT),m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -347,14 +347,14 @@ void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, st OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_ROLLBACK),m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -369,7 +369,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -380,13 +380,13 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isReadOnly() { // const member which will initialized only once return m_bReadOnly; } -void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setCatalog( const OUString& catalog ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -398,7 +398,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -413,7 +413,7 @@ OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeExcepti return OUString(pCat,nValueLen,getTextEncoding()); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -425,7 +425,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -439,7 +439,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return nTxn; } -Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -448,13 +448,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, std::exception) +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, std::exception) +void SAL_CALL OConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -465,12 +465,12 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std:: } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OConnection::getWarnings( ) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::clearWarnings( ) { } diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx index 65336c2095a2..2fe1f8bfeedc 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx @@ -81,7 +81,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) return xRef; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) { Reference< XResultSet > xRef; if(!m_bUseCatalog) @@ -114,7 +114,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) return aVal; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) { Reference< XResultSet > xRef; try @@ -132,7 +132,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, std::exception) + const OUString& columnNamePattern ) { Reference< XResultSet > xRef; try @@ -150,7 +150,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, std::exception) + const OUString& columnNamePattern ) { Reference< XResultSet > xRef; try @@ -168,7 +168,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, std::exception) + const OUString& tableNamePattern, const Sequence< OUString >& types ) { Reference< XResultSet > xRef; try @@ -186,7 +186,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, std::exception) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) { Reference< XResultSet > xRef; try @@ -204,7 +204,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, std::exception) + const OUString& procedureNamePattern ) { Reference< XResultSet > xRef; try @@ -221,7 +221,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; bool bSuccess = false; @@ -247,77 +247,77 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_BINARY_LITERAL_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CATALOG_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CHAR_LITERAL_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMN_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_INDEX,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CURSOR_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_DRIVER_CONNECTIONS/*SQL_ACTIVE_CONNECTIONS*/,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_TABLE,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_STATEMENT_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_TABLE_NAME_LEN,nValue,*this); @@ -332,7 +332,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, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; try @@ -349,7 +349,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, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; try @@ -366,7 +366,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, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; try @@ -384,7 +384,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, std::exception) + sal_Bool unique, sal_Bool approximate ) { Reference< XResultSet > xRef; try @@ -402,7 +402,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) + sal_Bool nullable ) { Reference< XResultSet > xRef; try @@ -419,7 +419,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) { @@ -434,7 +434,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, std::exception) + const OUString& foreignSchema, const OUString& foreignTable ) { Reference< XResultSet > xRef; try @@ -451,21 +451,21 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( return xRef; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { OUString aVal; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE_INCLUDES_LONG,aVal,*this,m_pConnection->getTextEncoding()); return aVal.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this); return nValue == SQL_IC_LOWER; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -479,21 +479,21 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this); return nValue == SQL_IC_UPPER; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -516,21 +516,21 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) ((nValue & SQL_AT_DROP_COLUMN_RESTRICT) == SQL_AT_DROP_COLUMN_RESTRICT); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_INDEX_SIZE,nValue,*this); return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NON_NULLABLE_COLUMNS,nValue,*this); return nValue == SQL_NNC_NON_NULL; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { OUString aVal; if(m_bUseCatalog) @@ -545,14 +545,14 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return aVal; } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SPECIAL_CHARACTERS,aVal,*this,m_pConnection->getTextEncoding()); return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); @@ -567,77 +567,77 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return nValue == SQL_CL_START; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_DDL_IGNORE; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_DDL_COMMIT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_DML; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_ALL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this); return (nValue & SQL_CA1_POS_DELETE) == SQL_CA1_POS_DELETE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this); return (nValue & SQL_CA1_POS_UPDATE) == SQL_CA1_POS_UPDATE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_ISOLATION_OPTION,nValue,*this); @@ -651,28 +651,28 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return (nValue & SQL_SU_DML_STATEMENTS) == SQL_SU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); return static_cast<bool>(nValue & SQL_SC_SQL92_FULL); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); return static_cast<bool>(nValue &SQL_SC_SQL92_ENTRY); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { OUString aStr; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_INTEGRITY,aStr,*this,m_pConnection->getTextEncoding()); return aStr.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); @@ -694,7 +694,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return (nValue & SQL_CU_TABLE_DEFINITION) == SQL_CU_TABLE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -710,14 +710,14 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return (nValue & SQL_CU_DML_STATEMENTS) == SQL_CU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this); return ((nValue & (SQL_OJ_FULL|SQL_OJ_LEFT|SQL_OJ_RIGHT|SQL_OJ_NESTED|SQL_OJ_NOT_ORDERED|SQL_OJ_ALL_COMPARISON_OPS|SQL_OJ_INNER)) != 0); } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { Reference< XResultSet > xRef; try @@ -740,103 +740,103 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_PROCEDURE_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_SCHEMA_NAME_LEN,nValue,*this); return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue != SQL_TC_NONE; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this); return (nValue & SQL_CA1_POSITIONED_UPDATE) == SQL_CA1_POSITIONED_UPDATE; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_TABLES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this); return nValue == SQL_FILE_CATALOG; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this); return nValue == SQL_FILE_TABLE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_FUNCTIONS,nValue,*this); return (nValue & SQL_FN_CVT_CONVERT) == SQL_FN_CVT_CONVERT; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONCAT_NULL_BEHAVIOR,nValue,*this); return nValue == SQL_CB_NULL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_COLUMN_ALIAS,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); return nValue != SQL_CN_NONE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) { if(fromType == toType) return true; @@ -992,77 +992,77 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In return bConvert; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_EXPRESSIONS_IN_ORDERBY,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this); return nValue != SQL_GB_NOT_SUPPORTED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this); return nValue != SQL_GB_GROUP_BY_CONTAINS_SELECT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this); return nValue == SQL_GB_NO_RELATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULTIPLE_ACTIVE_TXN,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULT_RESULT_SETS,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_LIKE_ESCAPE_CLAUSE,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ORDER_BY_COLUMNS_IN_SELECT,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'N'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this); return (nValue & SQL_U_UNION) == SQL_U_UNION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this); return (nValue & SQL_U_UNION_ALL) == SQL_U_UNION_ALL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -1076,49 +1076,49 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_END; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_START; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_HIGH; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_LOW; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); return (nValue & SQL_SU_PROCEDURE_INVOCATION) == SQL_SU_PROCEDURE_INVOCATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); return (nValue & SQL_SU_PRIVILEGE_DEFINITION) == SQL_SU_PRIVILEGE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -1126,7 +1126,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw( return (nValue & SQL_CU_PROCEDURE_INVOCATION) == SQL_CU_PROCEDURE_INVOCATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -1134,42 +1134,42 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) return (nValue & SQL_CU_PRIVILEGE_DEFINITION) == SQL_CU_PRIVILEGE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_CORRELATED_SUBQUERIES) == SQL_SQ_CORRELATED_SUBQUERIES; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_COMPARISON) == SQL_SQ_COMPARISON; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_EXISTS) == SQL_SQ_EXISTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_IN) == SQL_SQ_IN; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_QUANTIFIED) == SQL_SQ_QUANTIFIED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); @@ -1183,7 +1183,7 @@ OUString ODatabaseMetaData::getURLImpl() return aValue; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { OUString aValue = m_pConnection->getURL(); if ( aValue.isEmpty() ) @@ -1193,56 +1193,56 @@ OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeExcep return aValue; } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_USER_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DBMS_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURE_TERM,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_TERM,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) try +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) try { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); @@ -1253,7 +1253,7 @@ catch (const SQLException &) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { SQLUINTEGER nValue; sal_Int32 nValueTranslated; @@ -1278,7 +1278,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(S return nValueTranslated; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) try +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) try { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); @@ -1289,21 +1289,21 @@ catch (const SQLException &) return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_KEYWORDS,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SEARCH_PATTERN_ESCAPE,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1364,7 +1364,7 @@ OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1419,7 +1419,7 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1438,7 +1438,7 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1499,7 +1499,7 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { SQLUINTEGER nValue; // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent. @@ -1510,7 +1510,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLExc return nValue == SQL_OSC_EXTENDED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { SQLUINTEGER nValue; // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent. @@ -1521,7 +1521,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLExcepti return nValue == SQL_OSC_CORE || nValue == SQL_OSC_EXTENDED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { SQLUINTEGER nValue; // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent. @@ -1532,54 +1532,54 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLExce return nValue == SQL_OSC_MINIMUM || nValue == SQL_OSC_CORE || nValue == SQL_OSC_EXTENDED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this); return (nValue & SQL_OJ_FULL) == SQL_OJ_FULL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return supportsFullOuterJoins( ); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_GROUP_BY,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_ORDER_BY,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_SELECT,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_USER_NAME_LEN,nValue,*this); return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_SENSITIVITY,nValue,*this); return (nValue & static_cast<SQLUINTEGER>(setType)) == static_cast<SQLUINTEGER>(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1611,7 +1611,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set return bRet; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1633,7 +1633,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) t return (nValue & SQL_CA2_SENSITIVITY_UPDATES) == SQL_CA2_SENSITIVITY_UPDATES; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1655,7 +1655,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) t return (nValue & SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1677,42 +1677,42 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) t return (nValue & SQL_CA2_SENSITIVITY_ADDITIONS) == SQL_CA2_SENSITIVITY_ADDITIONS; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { return ownUpdatesAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { return ownDeletesAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { return ownInsertsAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { return nullptr; } diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 91f4afd47252..bf3254aa2e6f 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -98,13 +98,13 @@ void ODatabaseMetaDataResultSet::disposing() m_pConnection.clear(); } -Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -119,7 +119,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() ODatabaseMetaDataResultSet_BASE::release(); } -Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), @@ -142,7 +142,7 @@ sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -189,20 +189,20 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBinaryStream", *this ); return nullptr; } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -231,13 +231,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex } -sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) { return getInteger<sal_Int8, SQL_C_STINYINT>( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -266,7 +266,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co } -css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -288,7 +288,7 @@ css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIn } -double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -305,7 +305,7 @@ double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) t } -float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -322,25 +322,25 @@ float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) thr } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) { return getInteger<sal_Int32, SQL_C_SLONG>( columnIndex ); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) { return 0; } -sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) { return getInteger<sal_Int64, SQL_C_SBIGINT>( columnIndex ); } -Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -349,46 +349,46 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData return m_xMetaData; } -Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) { return getInteger<sal_Int16, SQL_C_SSHORT>( columnIndex ); } -OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -406,7 +406,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -423,7 +423,7 @@ css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIn } -css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -441,7 +441,7 @@ css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -451,7 +451,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException return m_nCurrentFetchState == SQL_NO_DATA; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -461,7 +461,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, Ru return m_nRowPos == 1; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -471,7 +471,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA; } -void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -483,7 +483,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, Ru m_nCurrentFetchState = SQL_SUCCESS; } -void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -495,7 +495,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, Runt } -void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::close( ) { { @@ -507,7 +507,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -524,7 +524,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, Runt } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -539,7 +539,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, Runti return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -555,7 +555,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -571,7 +571,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -589,13 +589,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R return bRet; } -Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) { return nullptr; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, return m_pRowStatusArray[0] == SQL_ROW_DELETED; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -614,7 +614,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException return m_pRowStatusArray[0] == SQL_ROW_ADDED; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -625,7 +625,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -636,7 +636,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLExcepti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -655,7 +655,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -665,7 +665,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru return m_bWasNull; } -void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -674,7 +674,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, Run } -void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -684,22 +684,22 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std N3SQLCancel(m_aStatementHandle); } -void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) { } -Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) { return Any(); } -sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() throw(SQLException, RuntimeException) +sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() { sal_Int32 nValue=1; return nValue; } -OUString ODatabaseMetaDataResultSet::getCursorName() throw(SQLException, RuntimeException) +OUString ODatabaseMetaDataResultSet::getCursorName() { return OUString(); } @@ -735,9 +735,6 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) { switch(nHandle) { @@ -755,7 +752,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( return false; } -void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) throw (Exception, std::exception) +void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) { switch(nHandle) { @@ -792,7 +789,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH } } -void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openTypeInfo() { TInt2IntMap aMap; aMap[SQL_BIT] = DataType::BIT; @@ -836,7 +833,7 @@ void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeExcep void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const Sequence< OUString >& types ) throw(SQLException, RuntimeException) + const Sequence< OUString >& types ) { OString aPKQ,aPKO,aPKN,aCOL; const OUString *pSchemaPat = nullptr; @@ -883,7 +880,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& } -void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openTablesTypes( ) { SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, nullptr,0, @@ -899,7 +896,7 @@ void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeE checkColumnCount(); } -void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openCatalogs() { SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, reinterpret_cast<SDB_ODBC_CHAR *>(const_cast<char *>(SQL_ALL_CATALOGS)),SQL_NTS, @@ -916,7 +913,7 @@ void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeExcep checkColumnCount(); } -void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openSchemas() { SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, reinterpret_cast<SDB_ODBC_CHAR *>(const_cast<char *>("")),SQL_NTS, @@ -934,7 +931,6 @@ void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeExcept void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -969,7 +965,6 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -1037,7 +1032,6 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern,const OUString& columnNamePattern ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -1071,7 +1065,6 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -1102,7 +1095,6 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri void ODatabaseMetaDataResultSet::openSpecialColumns(bool _bRowVer,const Any& catalog, const OUString& schema, const OUString& table,sal_Int32 scope, bool nullable ) - throw(SQLException, RuntimeException) { // Some ODBC drivers really don't like getting an empty string as tableName // E.g. psqlodbc up to at least version 09.01.0100 segfaults @@ -1142,13 +1134,13 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(bool _bRowVer,const Any& cat } void ODatabaseMetaDataResultSet::openVersionColumns(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { openSpecialColumns(true,catalog,schema,table,SQL_SCOPE_TRANSACTION,false); } void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, const OUString& schema, - const OUString& table,sal_Int32 scope,bool nullable ) throw(SQLException, RuntimeException) + const OUString& table,sal_Int32 scope,bool nullable ) { openSpecialColumns(false,catalog,schema,table,scope,nullable); } @@ -1156,7 +1148,7 @@ void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, cons void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUString* schema, const OUString* table, const Any& catalog2, const OUString* schema2, - const OUString* table2) throw(SQLException, RuntimeException) + const OUString* table2) { OString aPKQ, aPKO, aPKN, aFKQ, aFKO, aFKN; if ( catalog.hasValue() ) @@ -1185,20 +1177,20 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUSt } void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { openForeignKeys(Any(),nullptr,nullptr,catalog, schema == "%" ? &schema : nullptr, &table); } void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { openForeignKeys(catalog, schema == "%" ? &schema : nullptr, &table,Any(),nullptr,nullptr); } void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { const OUString *pSchemaPat = nullptr; @@ -1227,7 +1219,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr } void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const OUString& schemaPattern, - const OUString& tableNamePattern) throw(SQLException, RuntimeException) + const OUString& tableNamePattern) { const OUString *pSchemaPat = nullptr; @@ -1257,7 +1249,6 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, bool unique, bool approximate ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index aad846a8e753..c22db08d7226 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -57,7 +57,7 @@ void ODBCDriver::disposing() // static ServiceInfo -OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODBCDriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.ODBCDriver"); // this name is referenced in the configuration and in the odbc.xml @@ -65,31 +65,31 @@ OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeException) } -Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) { Sequence<OUString> aSNS { "com.sun.star.sdbc.Driver" }; return aSNS; } -OUString SAL_CALL ODBCDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODBCDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) return nullptr; @@ -109,12 +109,11 @@ Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, cons } sal_Bool SAL_CALL ODBCDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:odbc:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { @@ -196,12 +195,12 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL ODBCDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODBCDriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) { return 0; } diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 6b33d555c7f2..545b7645c38c 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -99,19 +99,19 @@ void SAL_CALL OPreparedStatement::release() throw() OStatement_BASE2::release(); } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : OPreparedStatement_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OStatement_BASE2::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -125,7 +125,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::close( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -150,7 +150,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -213,7 +213,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -236,13 +236,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { setParameter(parameterIndex, DataType::CHAR, invalid_scale, x); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -251,7 +251,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -271,7 +271,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { // Set the parameter as if it were an integer setInt (parameterIndex, x ? 1 : 0 ); @@ -412,18 +412,18 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ OTools::ThrowException(m_pConnection.get(), nRetcode, m_aStatementHandle, SQL_HANDLE_STMT, *this); } -void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) { setScalarParameter(parameterIndex, DataType::TINYINT, 3, 0, x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) { DATE_STRUCT x(OTools::DateToOdbcDate(aData)); setScalarParameter<DATE_STRUCT&>(parameterIndex, DataType::DATE, 10, x); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) { SQLULEN nColSize; if(aVal.NanoSeconds == 0) @@ -451,7 +451,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css:: } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) { SQLULEN nColSize; if(aVal.NanoSeconds == 0) @@ -485,25 +485,25 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { setScalarParameter(parameterIndex, DataType::DOUBLE, 15, x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { setScalarParameter(parameterIndex, DataType::FLOAT, 15, x); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { setScalarParameter(parameterIndex, DataType::INTEGER, 10, 0, x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { try { @@ -516,7 +516,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType ) { ::osl::MutexGuard aGuard( m_aMutex ); setParameterPre(parameterIndex); @@ -550,32 +550,32 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_I } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) { if ( x.is() ) setStream(parameterIndex, x->getCharacterStream(), x->length(), DataType::LONGVARCHAR); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) { if ( x.is() ) setStream(parameterIndex, x->getBinaryStream(), x->length(), DataType::LONGVARBINARY); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -616,13 +616,13 @@ 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, std::exception) +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, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if (!::dbtools::implSetObject(this, parameterIndex, x)) { // there is no other setXXX call which can handle the value in x @@ -631,19 +631,19 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { setScalarParameter(parameterIndex, DataType::SMALLINT, 5, 0, x); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { setParameter(parameterIndex, DataType::BINARY, x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { // LEM: It is quite unclear to me what the interface here is. // The XInputStream provides *bytes*, not characters. @@ -651,13 +651,13 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { setStream(parameterIndex, x, length, DataType::LONGVARBINARY); } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { ::osl::MutexGuard aGuard( m_aMutex ); prepareStatement(); @@ -666,7 +666,7 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim N3SQLFreeStmt (m_aStatementHandle, SQL_UNBIND); } -void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearBatch( ) { ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::clearBatch", *this ); // clearParameters( ); @@ -674,13 +674,13 @@ void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeExce } -void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::addBatch( ) { ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::addBatch", *this ); } -Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) { ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::executeBatch", *this ); // not reached, but keep -Werror happy @@ -695,7 +695,7 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLExc // Initialize the bound parameter objects -void OPreparedStatement::initBoundParam () throw(SQLException) +void OPreparedStatement::initBoundParam () { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); // Get the number of parameters @@ -759,7 +759,6 @@ SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index) // Puts parameter data from a previously bound input stream. The // input stream was bound using SQL_LEN_DATA_AT_EXEC. void OPreparedStatement::putParamData (sal_Int32 index) - throw (SQLException, RuntimeException) { // Sanity check the parameter index if ((index < 1) || @@ -827,7 +826,6 @@ void OPreparedStatement::setStream( const Reference< XInputStream>& x, SQLLEN length, sal_Int32 _nType) - throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -878,7 +876,7 @@ void OPreparedStatement::FreeParams() boundParams = nullptr; } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { try { diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index 7c88c3260243..9ad73f59038e 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -258,7 +258,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) } -css::uno::Reference< css::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ORealObdcDriver(_rxFactory)); } diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index d015bb42c0bd..b4b092b87697 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -34,8 +34,7 @@ namespace connectivity { namespace odbc { /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory) - throw (css::uno::Exception); +ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory); } } diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 3b2ffb848e99..9b9acd0681f2 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -62,12 +62,12 @@ namespace // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.odbc.ResultSet"); } - Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -75,7 +75,7 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -345,13 +345,13 @@ void OResultSet::releaseBuffer() m_aLengthVector.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OResultSet::getTypes( ) { OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), cppu::UnoType<css::beans::XFastPropertySet>::get(), @@ -361,7 +361,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -413,7 +413,7 @@ void OResultSet::invalidateCache() } } -Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -423,7 +423,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*colu return nullptr; } -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -443,7 +443,7 @@ template < typename T > T OResultSet::impl_getValue( const sal_Int32 _nColumnInd } // this function exists for the implicit conversion to sal_Bool (compared to a direct call to impl_getValue) -bool OResultSet::impl_getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +bool OResultSet::impl_getBoolean( sal_Int32 columnIndex ) { return impl_getValue<sal_Int8>(columnIndex, SQL_C_BIT); } @@ -456,18 +456,18 @@ template < typename T > T OResultSet::getValue( sal_Int32 columnIndex ) m_bWasNull = m_aRow[columnIndex].isNull(); return m_aRow[columnIndex]; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) { return getValue<bool>( columnIndex ); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) { return getValue<sal_Int8>( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -491,7 +491,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro } return nRet; } -Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) { const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex); @@ -512,7 +512,7 @@ Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQ } } -Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Date OResultSet::impl_getDate( sal_Int32 columnIndex ) { DATE_STRUCT aDate = impl_getValue< DATE_STRUCT> ( columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_DATE : SQL_C_TYPE_DATE ); @@ -520,38 +520,38 @@ Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, Runti return Date(aDate.day, aDate.month, aDate.year); } -Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) { return getValue<Date>( columnIndex ); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) { return getValue<double>( columnIndex ); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) { return getValue<float>( columnIndex ); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) { return getValue<sal_Int16>( columnIndex ); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) { return getValue<sal_Int32>( columnIndex ); } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) { return getValue<sal_Int64>( columnIndex ); } -sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) { try { @@ -563,7 +563,7 @@ sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException, } } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -571,7 +571,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, return m_pSkipDeletedSet ? m_pSkipDeletedSet->getMappedPosition(getDriverPos()) : getDriverPos(); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -582,62 +582,62 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return getValue<ORowSetValue>( columnIndex ).makeAny(); } -OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString OResultSet::impl_getString( sal_Int32 columnIndex ) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex); return OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding); } -OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString OResultSet::getString( sal_Int32 columnIndex ) { return getValue<OUString>( columnIndex ); } -Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Time OResultSet::impl_getTime( sal_Int32 columnIndex ) { TIME_STRUCT aTime = impl_getValue< TIME_STRUCT > ( columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_TIME : SQL_C_TYPE_TIME ); return Time(0, aTime.second,aTime.minute,aTime.hour, false); } -Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) { return getValue<Time>( columnIndex ); } -DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) { TIMESTAMP_STRUCT aTime = impl_getValue< TIMESTAMP_STRUCT > ( columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_TIMESTAMP : SQL_C_TYPE_TIMESTAMP ); @@ -651,19 +651,19 @@ DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) throw(SQLExcepti aTime.year, false); } -DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue<DateTime>( columnIndex ); } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_nRowPos == 0; } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -671,7 +671,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return m_nRowPos != 0 && m_nCurrentFetchState == SQL_NO_DATA; } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -679,7 +679,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, return m_nRowPos == 1; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -688,7 +688,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA; } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -699,7 +699,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, m_nCurrentFetchState = SQL_SUCCESS; } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -710,7 +710,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st } -void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -721,33 +721,33 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::e } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::first( ) { return moveImpl(IResultSetHelper::FIRST,0); } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::last( ) { return moveImpl(IResultSetHelper::LAST,0); } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) { return moveImpl(IResultSetHelper::ABSOLUTE1,row); } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) { return moveImpl(IResultSetHelper::RELATIVE1,row); } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::previous( ) { return moveImpl(IResultSetHelper::PRIOR,0); } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -755,7 +755,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowDeleted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -766,7 +766,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, return bRet; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -777,7 +777,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return bInserted; } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -787,13 +787,13 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::next( ) { return moveImpl(IResultSetHelper::NEXT,1); } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -802,7 +802,7 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OResultSet::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -811,16 +811,16 @@ void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) N3SQLCancel(m_aStatementHandle); } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::clearWarnings( ) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getWarnings( ) { return Any(); } -void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::insertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -896,7 +896,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st } -void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -946,7 +946,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, st } } -void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::deleteRow( ) { SQLRETURN nRet = SQL_SUCCESS; sal_Int32 nPos = getDriverPos(); @@ -972,12 +972,12 @@ void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException, st } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::cancelRowUpdates( ) { } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToInsertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -991,12 +991,12 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToCurrentRow( ) { invalidateCache(); } -void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(SQLException, RuntimeException) +void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1017,7 +1017,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pVa m_pStatement->getOwnConnection()->useOldDateFormat()); } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1028,44 +1028,44 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException } -void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex,SQL_BIT,&x); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateValue(columnIndex,SQL_CHAR,&x); } -void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateValue(columnIndex,SQL_TINYINT,&x); } -void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateValue(columnIndex,SQL_INTEGER,&x); } -void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) { updateValue(columnIndex,SQL_REAL,&x); } -void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) { updateValue(columnIndex,SQL_DOUBLE,&x); } -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { sal_Int32 nType = m_aRow[columnIndex].getTypeKind(); SQLSMALLINT nOdbcType = OTools::jdbcTypeToOdbc(nType); @@ -1075,7 +1075,7 @@ void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x updateValue(columnIndex,nOdbcType,const_cast<OUString *>(&x)); } -void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) { sal_Int32 nType = m_aRow[columnIndex].getTypeKind(); SQLSMALLINT nOdbcType = OTools::jdbcTypeToOdbc(nType); @@ -1085,28 +1085,28 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa updateValue(columnIndex,nOdbcType,const_cast<css::uno::Sequence<sal_Int8> *>(&x)); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) { DATE_STRUCT aVal = OTools::DateToOdbcDate(x); updateValue(columnIndex,SQL_DATE,&aVal); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { TIME_STRUCT aVal = OTools::TimeToOdbcTime(x); updateValue(columnIndex,SQL_TIME,&aVal); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) { TIMESTAMP_STRUCT aVal = OTools::DateTimeToTimestamp(x); updateValue(columnIndex,SQL_TIMESTAMP,&aVal); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -1116,12 +1116,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateBytes(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) { updateBinaryStream(columnIndex,x,length); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1132,28 +1132,28 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, s OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +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, std::exception) +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, std::exception) +Any SAL_CALL OResultSet::getBookmark( ) { fillColumn(0); if(m_aRow[0].isNull()) throw SQLException(); return m_aRow[0].makeAny(); } -Sequence<sal_Int8> OResultSet::impl_getBookmark( ) throw( SQLException, RuntimeException) +Sequence<sal_Int8> OResultSet::impl_getBookmark( ) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1182,7 +1182,7 @@ Sequence<sal_Int8> OResultSet::impl_getBookmark( ) throw( SQLException, Runtim } } -sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1210,7 +1210,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLE return false; } -sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1226,7 +1226,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_ return m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO; } -sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1234,19 +1234,19 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL; } -sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) { return false; } -sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& /*bookmark*/ ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& /*bookmark*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRowLocate::hashBookmark", *this ); return 0; } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw( SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) { Sequence< sal_Int32 > aRet(rows.getLength()); sal_Int32 *pRet = aRet.getArray(); @@ -1434,7 +1434,6 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { switch(nHandle) { @@ -1457,7 +1456,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception, std::exception) { switch(nHandle) { @@ -1633,7 +1631,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx index f8bccd491b90..087e94973518 100644 --- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx @@ -30,7 +30,7 @@ OResultSetMetaData::~OResultSetMetaData() { } -OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException) +OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) { sal_Int32 column = _column; if(_column <(sal_Int32) m_vMapping.size()) // use mapping @@ -80,7 +80,7 @@ SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection ,SQLHANDLE _aStatementHandle ,const css::uno::Reference< css::uno::XInterface >& _xInterface ,sal_Int32 _column - ,sal_Int32 _ident) throw(SQLException, RuntimeException) + ,sal_Int32 _ident) { SQLLEN nValue=0; OTools::ThrowException(_pConnection,(*reinterpret_cast<T3SQLColAttribute>(_pConnection->getOdbcFunction(ODBC3SQLFunctionId::ColAttribute)))(_aStatementHandle, @@ -93,7 +93,7 @@ SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection return nValue; } -sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException) +sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident) { sal_Int32 column = _column; if(_column < (sal_Int32)m_vMapping.size()) // use mapping @@ -102,7 +102,7 @@ sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident) return getNumColAttrib(m_pConnection,m_aStatementHandle,*this,column,ident); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE); } @@ -111,7 +111,6 @@ SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection ,SQLHANDLE _aStatementHandle ,const css::uno::Reference< css::uno::XInterface >& _xInterface ,sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { SQLSMALLINT nType = 0; try @@ -128,7 +127,7 @@ SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection return nType; } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { ::std::map<sal_Int32,sal_Int32>::iterator aFind = m_aColumnTypes.find(column); if ( aFind == m_aColumnTypes.end() ) @@ -159,7 +158,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(S } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { if(m_nColCount != -1) return m_nColCount; @@ -169,67 +168,67 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_CASE_SENSITIVE) == SQL_TRUE; } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) { return getCharColAttrib(column,SQL_DESC_SCHEMA_NAME); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { return getCharColAttrib(column,SQL_DESC_NAME); } -OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) { return getCharColAttrib(column,SQL_DESC_TABLE_NAME); } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) { return getCharColAttrib(column,SQL_DESC_CATALOG_NAME); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { return getCharColAttrib(column,SQL_DESC_TYPE_NAME); } -OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return getCharColAttrib(column,SQL_DESC_LABEL); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_FIXED_PREC_SCALE) == SQL_TRUE; } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_AUTO_UNIQUE_VALUE) == SQL_TRUE; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { sal_Int32 nType = 0; try @@ -244,7 +243,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return nType; } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { sal_Int32 nType = 0; try @@ -260,30 +259,30 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::s } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_NULLABLE); } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_SEARCHABLE) != SQL_PRED_NONE; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_READONLY; } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE; } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE; } diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 5a55ef84dcb2..ea21207d3e61 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -123,7 +123,7 @@ void SAL_CALL OStatement_BASE2::release() throw() release_ChildImpl(); } -Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) { if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get()) return Any(); @@ -131,7 +131,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), @@ -147,7 +147,7 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, return ::comphelper::concatSequences(aTypes.getTypes(),aOldTypes); } -Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues( ) throw (SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues( ) { OSL_ENSURE( m_pConnection.is() && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!"); Reference< XResultSet > xRes; @@ -164,7 +164,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues( ) throw ( return xRes; } -void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OStatement_Base::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -174,7 +174,7 @@ void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException, std::exception } -void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement_Base::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -185,13 +185,12 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException, s } -void SAL_CALL OStatement::clearBatch( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement::clearBatch( ) { } void OStatement_Base::reset() - throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -212,7 +211,6 @@ void OStatement_Base::reset() // clearMyResultSet // If a ResultSet was created for this Statement, close it void OStatement_Base::clearMyResultSet() - throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -230,7 +228,6 @@ void OStatement_Base::clearMyResultSet() } SQLLEN OStatement_Base::getRowCount() - throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -251,7 +248,7 @@ SQLLEN OStatement_Base::getRowCount() // If the given SQL statement contains a 'FOR UPDATE' clause, change // the concurrency to lock so that the row can then be updated. Returns // true if the concurrency has been changed -bool OStatement_Base::lockIfNecessary (const OUString& sql) throw (SQLException, RuntimeException) +bool OStatement_Base::lockIfNecessary (const OUString& sql) { bool rc = false; @@ -290,7 +287,6 @@ bool OStatement_Base::lockIfNecessary (const OUString& sql) throw (SQLException, void OStatement_Base::setWarning (const SQLWarning &ex) - throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -303,7 +299,6 @@ void OStatement_Base::setWarning (const SQLWarning &ex) // getColumnCount // Return the number of columns in the ResultSet sal_Int32 OStatement_Base::getColumnCount() - throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -322,7 +317,7 @@ sal_Int32 OStatement_Base::getColumnCount() } -sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -374,7 +369,6 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep // returns NULL if the current result is not a ResultSet. Reference< XResultSet > OStatement_Base::getResultSet(bool checkCount) - throw (SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -433,7 +427,7 @@ template < typename T, SQLINTEGER BufferLength > SQLRETURN OStatement_Base::setS } -Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -458,7 +452,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& } -Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -467,14 +461,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLEx } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +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, std::exception) +void SAL_CALL OStatement::addBatch( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -483,7 +477,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, std::exception) +Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -516,7 +510,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } -sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -544,7 +538,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S } -Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -555,7 +549,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLExce } -sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -573,7 +567,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, Runti } -sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -624,7 +618,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } -Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OStatement_Base::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -634,7 +628,7 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement_Base::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -913,7 +907,6 @@ sal_Bool OStatement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { bool bConverted = false; try @@ -969,7 +962,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( return bConverted; } -void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { try { @@ -1083,7 +1076,7 @@ OResultSet* OStatement_Base::createResulSet() return new OResultSet(m_aStatementHandle,this); } -Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index fafc3b8f4e95..1327d3892fe0 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -130,7 +130,7 @@ void OTools::getValue( OConnection* _pConnection, bool &_bWasNull, const css::uno::Reference< css::uno::XInterface >& _xInterface, void* _pValue, - SQLLEN _nSize) throw(css::sdbc::SQLException, css::uno::RuntimeException) + SQLLEN _nSize) { const size_t properSize = sqlTypeLen(_nType); if ( properSize == static_cast<size_t>(-1) ) @@ -171,7 +171,7 @@ void OTools::bindValue( OConnection* _pConnection, SQLLEN * const pLen, const css::uno::Reference< css::uno::XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding, - bool _bUseOldTimeDate) throw(css::sdbc::SQLException, css::uno::RuntimeException) + bool _bUseOldTimeDate) { SQLRETURN nRetcode; SQLSMALLINT fSqlType; @@ -307,7 +307,7 @@ void OTools::ThrowException(const OConnection* _pConnection, const SQLSMALLINT _nHandleType, const Reference< XInterface >& _xInterface, const bool _bNoFound, - const rtl_TextEncoding _nTextEncoding) throw(SQLException) + const rtl_TextEncoding _nTextEncoding) { switch(_rRetCode) { @@ -365,7 +365,7 @@ Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection, const sal_Int32 columnIndex, const SQLSMALLINT _fSqlType, bool &_bWasNull, - const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) + const Reference< XInterface >& _xInterface) { sal_Int8 aCharArray[2048]; // First try to fetch the data with the little Buffer: @@ -418,7 +418,7 @@ OUString OTools::getStringValue(OConnection* _pConnection, SQLSMALLINT _fSqlType, bool &_bWasNull, const Reference< XInterface >& _xInterface, - const rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException) + const rtl_TextEncoding _nTextEncoding) { OUStringBuffer aData; switch(_fSqlType) @@ -527,7 +527,7 @@ void OTools::GetInfo(OConnection* _pConnection, SQLUSMALLINT _nInfo, OUString &_rValue, const Reference< XInterface >& _xInterface, - rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException) + rtl_TextEncoding _nTextEncoding) { char aValue[512]; SQLSMALLINT nValueLen=0; @@ -542,7 +542,7 @@ void OTools::GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, sal_Int32 &_rValue, - const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) + const Reference< XInterface >& _xInterface) { SQLSMALLINT nValueLen; _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) @@ -555,7 +555,7 @@ void OTools::GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, SQLUINTEGER &_rValue, - const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) + const Reference< XInterface >& _xInterface) { SQLSMALLINT nValueLen; _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) @@ -568,7 +568,7 @@ void OTools::GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, SQLUSMALLINT &_rValue, - const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) + const Reference< XInterface >& _xInterface) { SQLSMALLINT nValueLen; _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx index 508174b18fb7..cf4b439527f2 100644 --- a/connectivity/source/drivers/postgresql/pq_array.cxx +++ b/connectivity/source/drivers/postgresql/pq_array.cxx @@ -55,20 +55,17 @@ namespace pq_sdbc_driver OUString Array::getBaseTypeName( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return OUString( "varchar" ); } sal_Int32 Array::getBaseType( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return css::sdbc::DataType::VARCHAR; } css::uno::Sequence< css::uno::Any > Array::getArray( const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return comphelper::containerToSequence(m_data); } @@ -77,7 +74,6 @@ css::uno::Sequence< css::uno::Any > Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkRange( index, count ); return Sequence< Any > ( &m_data[index-1], count ); @@ -85,7 +81,6 @@ css::uno::Sequence< css::uno::Any > Array::getArrayAtIndex( css::uno::Reference< css::sdbc::XResultSet > Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return getResultSetAtIndex( 0 , m_data.size() , typeMap ); } @@ -94,7 +89,6 @@ css::uno::Reference< css::sdbc::XResultSet > Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkRange( index, count ); std::vector< std::vector< Any > > ret( count ); diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx index 26581c6dced3..41f5ee9f7056 100644 --- a/connectivity/source/drivers/postgresql/pq_array.hxx +++ b/connectivity/source/drivers/postgresql/pq_array.hxx @@ -67,32 +67,26 @@ public: public: // XArray // Methods - virtual OUString SAL_CALL getBaseTypeName( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getBaseTypeName( ) override; - virtual sal_Int32 SAL_CALL getBaseType( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBaseType( ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArray( - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArrayAtIndex( sal_Int32 index, sal_Int32 count, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSetAtIndex( sal_Int32 index, sal_Int32 count, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; private: void checkRange( sal_Int32 index, sal_Int32 count ); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 71cb91b0b4be..5336ef24188f 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -151,7 +151,7 @@ BaseResultSet::~BaseResultSet() POSTGRE_TRACE( "dtor BaseResultSet" ); } -Any BaseResultSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any BaseResultSet::queryInterface( const Type & rType ) { Any aRet = BaseResultSet_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); @@ -173,7 +173,7 @@ Any BaseResultSet::queryInterface( const Type & rType ) throw (RuntimeException, // } // } -Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > BaseResultSet::getTypes() { static Sequence< Type > *pCollection; if( ! pCollection ) @@ -191,7 +191,7 @@ Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exceptio return *pCollection; } -Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> BaseResultSet::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -203,7 +203,7 @@ Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException // return new ResultSetMetaData( m_refMutex, this, &m_result ); // } -sal_Bool BaseResultSet::next( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::next( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -211,49 +211,49 @@ sal_Bool BaseResultSet::next( ) throw (SQLException, RuntimeException, std::exc return m_row < m_rowCount; } -sal_Bool BaseResultSet::isBeforeFirst( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isBeforeFirst( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row == -1; } -sal_Bool BaseResultSet::isAfterLast( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isAfterLast( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row >= m_rowCount; } -sal_Bool BaseResultSet::isFirst( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isFirst( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row == 0 && m_rowCount; } -sal_Bool BaseResultSet::isLast( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isLast( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row >= 0 && m_row + 1 == m_rowCount; } -void BaseResultSet::beforeFirst( ) throw (SQLException, RuntimeException, std::exception) +void BaseResultSet::beforeFirst( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); m_row = -1; } -void BaseResultSet::afterLast( ) throw (SQLException, RuntimeException, std::exception) +void BaseResultSet::afterLast( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); m_row = m_rowCount; } -sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::first( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -263,7 +263,7 @@ sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException, std::ex return bRet; } -sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::last( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -273,14 +273,14 @@ sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException, std::exc return bRet; } -sal_Int32 BaseResultSet::getRow( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 BaseResultSet::getRow( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row +1; } -sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::absolute( sal_Int32 row ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -299,7 +299,7 @@ sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeEx return true; } -sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::relative( sal_Int32 rows ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -312,7 +312,7 @@ sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeE return true; } -sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::previous( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -322,27 +322,27 @@ sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException, std: return bRet; } -void BaseResultSet::refreshRow( ) throw (SQLException, RuntimeException, std::exception) +void BaseResultSet::refreshRow( ) { // TODO: not supported for now } -sal_Bool BaseResultSet::rowUpdated( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::rowUpdated( ) { return false; } -sal_Bool BaseResultSet::rowInserted( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::rowInserted( ) { return false; } -sal_Bool BaseResultSet::rowDeleted( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::rowDeleted( ) { return false; } -Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, RuntimeException, std::exception) +Reference< XInterface > BaseResultSet::getStatement() { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -352,7 +352,7 @@ Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, Runti //----------------- XRow interface ---------------------------------------------------- -sal_Bool BaseResultSet::wasNull( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::wasNull( ) { return m_wasNull; } @@ -371,7 +371,7 @@ Any BaseResultSet::convertTo( const Any & val , const Type & type ) return aRet; } -sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -397,7 +397,6 @@ sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, } sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -409,7 +408,6 @@ sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex ) } sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -420,7 +418,7 @@ sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex ) return i; } -OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) +OUString BaseResultSet::getString( sal_Int32 columnIndex ) { MutexGuard guard(m_refMutex->mutex); checkClosed(); @@ -433,7 +431,6 @@ OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, } sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -445,7 +442,6 @@ sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex ) } sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -457,7 +453,6 @@ sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex ) } float BaseResultSet::getFloat( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -469,7 +464,6 @@ float BaseResultSet::getFloat( sal_Int32 columnIndex ) } double BaseResultSet::getDouble( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -480,7 +474,6 @@ double BaseResultSet::getDouble( sal_Int32 columnIndex ) } Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -507,32 +500,27 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) css::util::Date BaseResultSet::getDate( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDate( getString( columnIndex ) ); } css::util::Time BaseResultSet::getTime( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toTime( getString( columnIndex ) ); } css::util::DateTime BaseResultSet::getTimestamp( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDateTime( getString( columnIndex ) ); } // LEM TODO: these look like they are missing an actual implementation Reference< css::io::XInputStream > BaseResultSet::getBinaryStream( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return nullptr; } Reference< css::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return nullptr; } @@ -540,31 +528,26 @@ Reference< css::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 Any BaseResultSet::getObject( sal_Int32 /* columnIndex */, const Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (SQLException, RuntimeException, std::exception) { return Any(); } Reference< css::sdbc::XRef > BaseResultSet::getRef( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return Reference< css::sdbc::XRef > (); } Reference< css::sdbc::XBlob > BaseResultSet::getBlob( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return Reference< css::sdbc::XBlob > (); } Reference< css::sdbc::XClob > BaseResultSet::getClob( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return Reference< css::sdbc::XClob > (); } Reference< css::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return new Array( m_refMutex, parseArray( getString( columnIndex ) ), *this, m_tc ); } @@ -576,7 +559,6 @@ Reference< css::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex ) sal_Bool BaseResultSet::convertFastPropertyValue( Any & /* rConvertedValue */, Any & /* rOldValue */, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { bool bRet; switch( nHandle ) @@ -620,7 +602,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue( void BaseResultSet::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) + sal_Int32 nHandle,const Any& rValue ) { m_props[nHandle] = rValue; } @@ -631,7 +613,6 @@ void BaseResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } Reference < XPropertySetInfo > BaseResultSet::getPropertySetInfo() - throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getResultSetPropertyArrayHelper() ); } @@ -641,7 +622,7 @@ void BaseResultSet::disposing() close(); } -void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, RuntimeException ) +void BaseResultSet::checkColumnIndex(sal_Int32 index ) { if( index < 1 || index > m_fieldCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index caf3218b548f..2ac107c1925a 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -84,12 +84,10 @@ protected: @throws css::sdbc::SQLException @throws css::uno::RuntimeException */ - virtual void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) = 0; + virtual void checkClosed() = 0; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex( sal_Int32 index ) - throw ( css::sdbc::SQLException, css::uno::RuntimeException ); + void checkColumnIndex( sal_Int32 index ); void checkRowIndex(); virtual css::uno::Any getValue( sal_Int32 columnIndex ) = 0; @@ -109,18 +107,15 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { BaseResultSet_BASE::acquire(); } virtual void SAL_CALL release() throw() override { BaseResultSet_BASE::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XCloseable // virtual void SAL_CALL close( ) // throw (css::sdbc::SQLException, css::uno::RuntimeException) = 0; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XResultSetMetaDataSupplier // virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) @@ -128,87 +123,49 @@ public: // XResultSetMetaDataSupplier public: // XResultSet // Methods - virtual sal_Bool SAL_CALL next( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() override; public: // XRow - virtual sal_Bool SAL_CALL wasNull( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; public: // XColumnLocate // virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) @@ -221,13 +178,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -236,8 +191,7 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 0ae43eee2808..563345047368 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -105,7 +105,7 @@ public: { } - virtual void SAL_CALL dispose() throw (std::exception) override + virtual void SAL_CALL dispose() override { if( m_conn.is() ) { @@ -199,7 +199,7 @@ typedef ::std::list< css::uno::Reference< css::sdbc::XCloseable > > CloseableLis typedef ::std::list< css::uno::Reference< css::lang::XComponent > > DisposeableList; -void Connection::close() throw ( SQLException, RuntimeException, std::exception ) +void Connection::close() { CloseableList lst; DisposeableList lstDispose; @@ -253,7 +253,7 @@ void Connection::removeFromWeakMap( const ::rtl::ByteSequence & id ) m_myStatements.erase( ii ); } -Reference< XStatement > Connection::createStatement() throw (SQLException, RuntimeException, std::exception) +Reference< XStatement > Connection::createStatement() { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -268,7 +268,6 @@ Reference< XStatement > Connection::createStatement() throw (SQLException, Runti } Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -285,7 +284,6 @@ Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sq } Reference< XPreparedStatement > Connection::prepareCall( const OUString& ) - throw (SQLException, RuntimeException, std::exception) { throw SQLException( "pq_driver: Callable statements not supported", @@ -294,39 +292,37 @@ Reference< XPreparedStatement > Connection::prepareCall( const OUString& ) OUString Connection::nativeSQL( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { return sql; } -void Connection::setAutoCommit( sal_Bool ) throw (SQLException, RuntimeException, std::exception) +void Connection::setAutoCommit( sal_Bool ) { // UNSUPPORTED } -sal_Bool Connection::getAutoCommit() throw (SQLException, RuntimeException, std::exception) +sal_Bool Connection::getAutoCommit() { // UNSUPPORTED return true; } -void Connection::commit() throw (SQLException, RuntimeException, std::exception) +void Connection::commit() { // UNSUPPORTED } -void Connection::rollback() throw (SQLException, RuntimeException, std::exception) +void Connection::rollback() { // UNSUPPORTED } -sal_Bool Connection::isClosed() throw (SQLException, RuntimeException, std::exception) +sal_Bool Connection::isClosed() { return m_settings.pConnection == nullptr; } Reference< XDatabaseMetaData > Connection::getMetaData() - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -335,25 +331,24 @@ Reference< XDatabaseMetaData > Connection::getMetaData() return m_meta; } -void Connection::setReadOnly( sal_Bool ) throw (SQLException, RuntimeException, std::exception) +void Connection::setReadOnly( sal_Bool ) { // UNSUPPORTED } -sal_Bool Connection::isReadOnly() throw (SQLException, RuntimeException, std::exception) +sal_Bool Connection::isReadOnly() { // UNSUPPORTED return false; } void Connection::setCatalog( const OUString& ) - throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::exception) +OUString Connection::getCatalog() { MutexGuard guard( m_refMutex->mutex ); if( m_settings.pConnection == nullptr ) @@ -366,18 +361,17 @@ OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::ex } void Connection::setTransactionIsolation( sal_Int32 ) - throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -sal_Int32 Connection::getTransactionIsolation() throw (SQLException, RuntimeException, std::exception) +sal_Int32 Connection::getTransactionIsolation() { // UNSUPPORTED return 0; } -Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeException, std::exception) +Reference< XNameAccess > Connection::getTypeMap() { Reference< XNameAccess > t; { @@ -388,17 +382,16 @@ Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeEx } void Connection::setTypeMap( const Reference< XNameAccess >& typeMap ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); m_typeMap = typeMap; } -Any Connection::getWarnings() throw (SQLException, RuntimeException, std::exception) +Any Connection::getWarnings() { return Any(); } -void Connection::clearWarnings() throw (SQLException, RuntimeException, std::exception) +void Connection::clearWarnings() { } @@ -484,7 +477,6 @@ static void properties2arrays( const Sequence< PropertyValue > & args, } void Connection::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { OUString url; Sequence< PropertyValue > args; @@ -604,7 +596,7 @@ void Connection::disposing() close(); } -void Connection::checkClosed() throw ( SQLException, RuntimeException ) +void Connection::checkClosed() { if( !m_settings.pConnection ) throw SQLException( "pq_connection: Connection already closed", @@ -612,7 +604,6 @@ void Connection::checkClosed() throw ( SQLException, RuntimeException ) } Reference< XNameAccess > Connection::getTables() - throw (css::uno::RuntimeException, std::exception) { if (isLog(&m_settings, LogLevel::Info)) { @@ -628,7 +619,6 @@ Reference< XNameAccess > Connection::getTables() } Reference< XNameAccess > Connection::getViews() - throw (css::uno::RuntimeException, std::exception) { if (isLog(&m_settings, LogLevel::Info)) { @@ -645,7 +635,6 @@ Reference< XNameAccess > Connection::getViews() Reference< XNameAccess > Connection::getUsers() - throw (css::uno::RuntimeException, std::exception) { if (isLog(&m_settings, LogLevel::Info)) { @@ -660,7 +649,7 @@ Reference< XNameAccess > Connection::getUsers() /// @throws Exception Reference< XInterface > ConnectionCreateInstance( - const Reference< XComponentContext > & ctx ) throw (Exception, std::exception) + const Reference< XComponentContext > & ctx ) { ::rtl::Reference< RefCountedMutex > ref = new RefCountedMutex(); return * new Connection( ref, ctx ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index fe5cc2a31996..85f2a7e50f24 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -167,8 +167,7 @@ class Connection : public ConnectionBase private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ); + void checkClosed(); public: Connection( @@ -178,70 +177,48 @@ public: virtual ~Connection( ) override; public: // XCloseable - virtual void SAL_CALL close() - throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL close() override; public: // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override ; virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( - const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( - const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; virtual void SAL_CALL setTypeMap( - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; public: // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; public: // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; public: // XTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; public: // XUsersSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) override; public: // XViewsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) override; public: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index a99992655139..db26ab3abb9f 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -130,36 +130,36 @@ DatabaseMetaData::DatabaseMetaData( init_getPrivs_stmt(); } -sal_Bool DatabaseMetaData::allProceduresAreCallable( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::allProceduresAreCallable( ) { // TODO return false; } -sal_Bool DatabaseMetaData::allTablesAreSelectable( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::allTablesAreSelectable( ) { return true; } -OUString DatabaseMetaData::getURL( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getURL( ) { // TODO // LEM TODO: implement return OUString(); } -OUString DatabaseMetaData::getUserName( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getUserName( ) { return m_pSettings->user; } -sal_Bool DatabaseMetaData::isReadOnly( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::isReadOnly( ) { return false; } -sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) { // Whether NULL values are considered, for sorting purposes, LARGER than any other value. // Specification: http://download.oracle.com/javase/6/docs/api/java/sql/DatabaseMetaData.html#nullsAreSortedHigh() @@ -167,51 +167,51 @@ sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) throw (SQLException, RuntimeEx return true; } -sal_Bool DatabaseMetaData::nullsAreSortedLow( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedLow( ) { return ! nullsAreSortedHigh(); } -sal_Bool DatabaseMetaData::nullsAreSortedAtStart( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool DatabaseMetaData::nullsAreSortedAtEnd( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -OUString DatabaseMetaData::getDatabaseProductName( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDatabaseProductName( ) { return OUString("PostgreSQL"); } -OUString DatabaseMetaData::getDatabaseProductVersion( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDatabaseProductVersion( ) { return OUString::createFromAscii( PQparameterStatus( m_pSettings->pConnection, "server_version" ) ); } -OUString DatabaseMetaData::getDriverName( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDriverName( ) { return OUString("postgresql-sdbc"); } -OUString DatabaseMetaData::getDriverVersion( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDriverVersion( ) { return OUString(PQ_SDBC_DRIVER_VERSION); } -sal_Int32 DatabaseMetaData::getDriverMajorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getDriverMajorVersion( ) { return PQ_SDBC_MAJOR; } -sal_Int32 DatabaseMetaData::getDriverMinorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getDriverMinorVersion( ) { return PQ_SDBC_MINOR; } -sal_Bool DatabaseMetaData::usesLocalFiles( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::usesLocalFiles( ) { // LEM TODO: // http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/XDatabaseMetaData_Interface @@ -222,62 +222,62 @@ sal_Bool DatabaseMetaData::usesLocalFiles( ) throw (SQLException, RuntimeExcept return false; } -sal_Bool DatabaseMetaData::usesLocalFilePerTable( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers( ) { return true; } -sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return true; } -sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) { return false; } -OUString DatabaseMetaData::getIdentifierQuoteString( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getIdentifierQuoteString( ) { return OUString("\""); } -OUString DatabaseMetaData::getSQLKeywords( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSQLKeywords( ) { // In Java 6, this is all keywords that are not SQL:2003 // In Java 2 v1.4 and as per LibreOffice SDK doc, this is all keywords that are not SQL92 @@ -312,7 +312,7 @@ OUString DatabaseMetaData::getSQLKeywords( ) throw (SQLException, RuntimeExcept "WINDOW" //SQL:2003 ); } -OUString DatabaseMetaData::getNumericFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getNumericFunctions( ) { // See http://www.postgresql.org/docs/9.1/static/functions-math.html // LEM TODO: Err... http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Support_Scalar_Functions @@ -353,7 +353,7 @@ OUString DatabaseMetaData::getNumericFunctions( ) throw (SQLException, RuntimeE ); } -OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getStringFunctions( ) { // See http://www.postgresql.org/docs/9.1/static/functions-string.html return OUString( @@ -407,7 +407,7 @@ OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeEx ); } -OUString DatabaseMetaData::getSystemFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSystemFunctions( ) { // See http://www.postgresql.org/docs/9.1/static/functions-info.html // and http://www.postgresql.org/docs/9.1/static/functions-admin.html @@ -536,7 +536,7 @@ OUString DatabaseMetaData::getSystemFunctions( ) throw (SQLException, RuntimeEx "pg_sleep" ); } -OUString DatabaseMetaData::getTimeDateFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getTimeDateFunctions( ) { // TODO return OUString( @@ -565,112 +565,112 @@ OUString DatabaseMetaData::getTimeDateFunctions( ) throw (SQLException, Runtime "transaction_timestamp," ); } -OUString DatabaseMetaData::getSearchStringEscape( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSearchStringEscape( ) { return OUString("\\"); } -OUString DatabaseMetaData::getExtraNameCharacters( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getExtraNameCharacters( ) { return OUString("$"); } -sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn( ) { return true; } -sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn( ) { return true; } -sal_Bool DatabaseMetaData::supportsColumnAliasing( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsColumnAliasing( ) { return true; } -sal_Bool DatabaseMetaData::nullPlusNonNullIsNull( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullPlusNonNullIsNull( ) { return true; } -sal_Bool DatabaseMetaData::supportsTypeConversion( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTypeConversion( ) { // LEM: this is specifically whether the "CONVERT" function is supported // It seems that in PostgreSQL, that function is only for string encoding, so no. return false; } -sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) { (void) fromType; (void) toType; return false; } -sal_Bool DatabaseMetaData::supportsTableCorrelationNames( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTableCorrelationNames( ) { // LEM: A correlation name is "bar" in "SELECT foo FROM qux [AS] bar WHERE ..." return true; } -sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } -sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy( ) { return true; } -sal_Bool DatabaseMetaData::supportsOrderByUnrelated( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOrderByUnrelated( ) { return true; } -sal_Bool DatabaseMetaData::supportsGroupBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsGroupBy( ) { return true; } -sal_Bool DatabaseMetaData::supportsGroupByUnrelated( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsGroupByUnrelated( ) { return true; } -sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect( ) { return true; } -sal_Bool DatabaseMetaData::supportsLikeEscapeClause( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsLikeEscapeClause( ) { return true; } -sal_Bool DatabaseMetaData::supportsMultipleResultSets( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMultipleResultSets( ) { return true; } -sal_Bool DatabaseMetaData::supportsMultipleTransactions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMultipleTransactions( ) { // Allows multiple transactions open at once (on different connections!) return true; } -sal_Bool DatabaseMetaData::supportsNonNullableColumns( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsNonNullableColumns( ) { return true; } -sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) { // LEM: jdbc driver says not, although the comments in it seem old // fdo#45249 Base query design won't use any aggregate function @@ -681,123 +681,123 @@ sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) throw (SQLException, Runti return true; } -sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; } -sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsANSI92FullSQL( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsANSI92FullSQL( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility( ) { // LEM: jdbc driver says yes, although comment says they are not sure what this means... return true; } -sal_Bool DatabaseMetaData::supportsOuterJoins( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOuterJoins( ) { return true; } -sal_Bool DatabaseMetaData::supportsFullOuterJoins( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsFullOuterJoins( ) { return true; } -sal_Bool DatabaseMetaData::supportsLimitedOuterJoins( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsLimitedOuterJoins( ) { return true; } -OUString DatabaseMetaData::getSchemaTerm( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSchemaTerm( ) { return OUString("SCHEMA"); } -OUString DatabaseMetaData::getProcedureTerm( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getProcedureTerm( ) { return OUString("function"); } -OUString DatabaseMetaData::getCatalogTerm( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getCatalogTerm( ) { return OUString("DATABASE"); } -sal_Bool DatabaseMetaData::isCatalogAtStart( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::isCatalogAtStart( ) { return true; } -OUString DatabaseMetaData::getCatalogSeparator( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getCatalogSeparator( ) { return OUString("."); } -sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return true; } -sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } @@ -807,98 +807,97 @@ sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw (SQL // to be supported; see {UPDATE,DELETE} /table/ (...) WHERE CURRENT OF /cursor_name/" syntax // and http://www.postgresql.org/docs/9.1/static/view-pg-cursors.html // http://www.postgresql.org/docs/9.1/static/libpq-example.html actually uses a cursor :) -sal_Bool DatabaseMetaData::supportsPositionedDelete( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsPositionedDelete( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsPositionedUpdate( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsPositionedUpdate( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsSelectForUpdate( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSelectForUpdate( ) { return true; } -sal_Bool DatabaseMetaData::supportsStoredProcedures( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsStoredProcedures( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInExists( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInExists( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInIns( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInIns( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds( ) { // LEM: jdbc driver says yes, although comment says they don't know what this means... return true; } -sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries( ) { return true; } -sal_Bool DatabaseMetaData::supportsUnion( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsUnion( ) { return true; } -sal_Bool DatabaseMetaData::supportsUnionAll( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsUnionAll( ) { return true; } -sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return true; } -sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return true; } -sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxCharLiteralLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxCharLiteralLength( ) { return 0; } // Copied / adapted / simplified from JDBC driver sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { MutexGuard guard( m_refMutex->mutex ); @@ -913,7 +912,6 @@ sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName) } sal_Int32 DatabaseMetaData::getMaxNameLength() - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if ( m_pSettings->maxNameLen == 0) m_pSettings->maxNameLen = getIntSetting( "max_identifier_length" ); @@ -922,7 +920,6 @@ sal_Int32 DatabaseMetaData::getMaxNameLength() } sal_Int32 DatabaseMetaData::getMaxIndexKeys() - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if ( m_pSettings->maxIndexKeys == 0) m_pSettings->maxIndexKeys = getIntSetting("max_index_keys"); @@ -930,69 +927,69 @@ sal_Int32 DatabaseMetaData::getMaxIndexKeys() return m_pSettings->maxIndexKeys; } -sal_Int32 DatabaseMetaData::getMaxColumnNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInIndex( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInIndex( ) { return getMaxIndexKeys(); } -sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInSelect( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInSelect( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInTable( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInTable( ) { return 1600; } -sal_Int32 DatabaseMetaData::getMaxConnections( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxConnections( ) { // LEM: The JDBC driver returns an arbitrary 8192; truth is as much as OS / hardware supports return 0; } -sal_Int32 DatabaseMetaData::getMaxCursorNameLength( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxCursorNameLength( ) //TODO, don't know { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxIndexLength( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxIndexLength( ) //TODO, don't know { // LEM: that's the index itself, not its name return 0; } -sal_Int32 DatabaseMetaData::getMaxSchemaNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxSchemaNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxProcedureNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxProcedureNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxCatalogNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxCatalogNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxRowSize( ) { // jdbc driver says 1GB, but http://www.postgresql.org/about/ says 1.6TB // and that 1GB is the maximum _field_ size @@ -1000,14 +997,14 @@ sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeExcept return 0; } -sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { // LEM: Err... PostgreSQL basically does not do BLOBs well // In any case, BLOBs do not change the maximal row length AFAIK return true; } -sal_Int32 DatabaseMetaData::getMaxStatementLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxStatementLength( ) { // LEM: actually, that would be 2^sizeof(size_t)-1 // on the server? on the client (because of libpq)? minimum of the two? not sure @@ -1015,37 +1012,37 @@ sal_Int32 DatabaseMetaData::getMaxStatementLength( ) throw (SQLException, Runti return 0; } -sal_Int32 DatabaseMetaData::getMaxStatements( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxStatements( ) //TODO, don't know { return 0; } -sal_Int32 DatabaseMetaData::getMaxTableNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxTableNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxTablesInSelect( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxTablesInSelect( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxUserNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxUserNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation( ) { return css::sdbc::TransactionIsolation::READ_COMMITTED; } -sal_Bool DatabaseMetaData::supportsTransactions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTransactions( ) { return true; } -sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { if ( level == css::sdbc::TransactionIsolation::READ_COMMITTED || level == css::sdbc::TransactionIsolation::SERIALIZABLE @@ -1057,22 +1054,21 @@ sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) } sal_Bool DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) - throw (SQLException, RuntimeException, std::exception) { return true; } -sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return false; } -sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return false; } -sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return false; } @@ -1080,7 +1076,7 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc css::uno::Reference< XResultSet > DatabaseMetaData::getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern ) { (void) catalog; (void) schemaPattern; (void) procedureNamePattern; // 1. PROCEDURE_CAT string => procedure catalog (may be NULL ) @@ -1106,7 +1102,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { (void) catalog; (void) schemaPattern; (void) procedureNamePattern; (void) columnNamePattern; MutexGuard guard( m_refMutex->mutex ); @@ -1121,7 +1117,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getTables( const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) - throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) types; Statics &statics = getStatics(); @@ -1256,7 +1251,6 @@ namespace } css::uno::Reference< XResultSet > DatabaseMetaData::getSchemas( ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -1291,7 +1285,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getSchemas( ) } css::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs( ) - throw (SQLException, RuntimeException, std::exception) { // LEM TODO: return the current catalog like JDBC driver? // at least fake the columns, even if no content @@ -1301,7 +1294,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs( ) } css::uno::Reference< XResultSet > DatabaseMetaData::getTableTypes( ) - throw (SQLException, RuntimeException, std::exception) { // LEM TODO: this can be made dynamic, see JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -1457,7 +1449,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { (void) catalog; // LEM TODO: review in comparison with JDBC driver @@ -1643,7 +1635,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { (void) catalog; @@ -1674,7 +1666,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges( css::uno::Reference< XResultSet > DatabaseMetaData::getTablePrivileges( const css::uno::Any&, const OUString& schemaPattern, - const OUString& tableNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& tableNamePattern ) { MutexGuard guard( m_refMutex->mutex ); @@ -1702,7 +1694,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier( const OUString&, const OUString&, sal_Int32, - sal_Bool ) throw (SQLException, RuntimeException, std::exception) + sal_Bool ) { //LEM TODO: implement! See JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -1713,7 +1705,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier( css::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns( const css::uno::Any&, const OUString&, - const OUString& ) throw (SQLException, RuntimeException, std::exception) + const OUString& ) { //LEM TODO: implement! See JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -1724,7 +1716,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns( css::uno::Reference< XResultSet > DatabaseMetaData::getPrimaryKeys( const css::uno::Any&, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException, std::exception) + const OUString& table ) { //LEM TODO: review MutexGuard guard( m_refMutex->mutex ); @@ -2075,7 +2067,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys( const OUString& primaryTable, const Any& /* foreignCatalog */, const OUString& foreignSchema, - const OUString& foreignTable ) throw (SQLException, RuntimeException) + const OUString& foreignTable ) { unsigned int i = 0; if ( ! primarySchema.isEmpty() ) @@ -2109,7 +2101,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys( css::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys( const css::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException, std::exception) + const OUString& table ) { return getImportedExportedKeys(Any(), OUString(), OUString(), catalog, schema, table); } @@ -2117,7 +2109,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys( css::uno::Reference< XResultSet > DatabaseMetaData::getExportedKeys( const css::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException, std::exception) + const OUString& table ) { return getImportedExportedKeys(catalog, schema, table, Any(), OUString(), OUString()); } @@ -2128,7 +2120,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getCrossReference( const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, - const OUString& foreignTable ) throw (SQLException, RuntimeException, std::exception) + const OUString& foreignTable ) { return getImportedExportedKeys( primaryCatalog, primarySchema, primaryTable, foreignCatalog, foreignSchema, foreignTable ); } @@ -2323,7 +2315,6 @@ namespace css::uno::Reference< XResultSet > DatabaseMetaData::getTypeInfo( ) - throw (SQLException, RuntimeException, std::exception) { // Note: Indexes start at 0 (in the API doc, they start at 1) MutexGuard guard( m_refMutex->mutex ); @@ -2378,7 +2369,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo( const OUString& schema, const OUString& table, sal_Bool unique, - sal_Bool ) throw (SQLException, RuntimeException, std::exception) + sal_Bool ) { //LEM TODO: review MutexGuard guard( m_refMutex->mutex ); @@ -2499,7 +2490,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo( } sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) - throw (SQLException, RuntimeException, std::exception) { if ( setType == css::sdbc::ResultSetType::SCROLL_SENSITIVE ) return false; @@ -2508,7 +2498,7 @@ sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) } sal_Bool DatabaseMetaData::supportsResultSetConcurrency( - sal_Int32 setType, sal_Int32 concurrency ) throw (SQLException, RuntimeException, std::exception) + sal_Int32 setType, sal_Int32 concurrency ) { (void) concurrency; if ( ! supportsResultSetType( setType ) ) @@ -2517,56 +2507,56 @@ sal_Bool DatabaseMetaData::supportsResultSetConcurrency( return true; } -sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ ) { return true; } -sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ ) { return true; } -sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ ) { return true; } -sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::supportsBatchUpdates( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsBatchUpdates( ) { return true; } -css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any&, const OUString&, const OUString&, const css::uno::Sequence< sal_Int32 >& ) throw (SQLException, RuntimeException, std::exception) +css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any&, const OUString&, const OUString&, const css::uno::Sequence< sal_Int32 >& ) { //LEM TODO: implement! See JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -2575,7 +2565,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any } css::uno::Reference< css::sdbc::XConnection > DatabaseMetaData::getConnection() - throw (SQLException, RuntimeException, std::exception) { return m_origin; } diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx index 7087f20387c4..2bb4ce1a0ddf 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx @@ -58,19 +58,18 @@ class DatabaseMetaData : /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - sal_Int32 getIntSetting(const OUString& settingName) throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getIntSetting(const OUString& settingName); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - sal_Int32 getMaxIndexKeys() throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getMaxIndexKeys(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - sal_Int32 getMaxNameLength() throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getMaxNameLength(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException css::uno::Reference< css::sdbc::XResultSet > getImportedExportedKeys( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, - const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) - throw (css::sdbc::SQLException, css::uno::RuntimeException); + const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ); void init_getReferences_stmt (); void init_getPrivs_stmt (); @@ -83,155 +82,155 @@ public: public: // Methods - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 5388f3409e50..21fa728448a0 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -81,7 +81,6 @@ Sequence< OUString > DriverGetSupportedServiceNames() Reference< XConnection > Driver::connect( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { if( ! acceptsURL( url ) ) // XDriver spec tells me to do so ... return Reference< XConnection > (); @@ -97,45 +96,40 @@ Reference< XConnection > Driver::connect( } sal_Bool Driver::acceptsURL( const OUString& url ) - throw (SQLException, RuntimeException, std::exception) { return url.startsWith( "sdbc:postgresql:" ); } Sequence< DriverPropertyInfo > Driver::getPropertyInfo( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { (void)url; (void)info; return Sequence< DriverPropertyInfo > (); } -sal_Int32 Driver::getMajorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 Driver::getMajorVersion( ) { return PQ_SDBC_MAJOR; } -sal_Int32 Driver::getMinorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 Driver::getMinorVersion( ) { return PQ_SDBC_MINOR; } // XServiceInfo OUString SAL_CALL Driver::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return DriverGetImplementationName(); } sal_Bool Driver::supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > Driver::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return DriverGetSupportedServiceNames(); } @@ -149,14 +143,12 @@ void Driver::disposing() Reference< XTablesSupplier > Driver::getDataDefinitionByConnection( const Reference< XConnection >& connection ) - throw (SQLException, RuntimeException, std::exception) { return Reference< XTablesSupplier >( connection , UNO_QUERY ); } Reference< XTablesSupplier > Driver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { return Reference< XTablesSupplier > ( connect( url, info ), UNO_QUERY ); } @@ -189,29 +181,24 @@ public: // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + Reference< XComponentContext > const & xContext ) override; virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + Reference< XComponentContext > const & xContext ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return m_implName; } - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override { for( int i = 0 ; i < m_serviceNames.getLength() ; i ++ ) if( m_serviceNames[i] == ServiceName ) return true; return false; } - Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override + Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return m_serviceNames; } @@ -229,7 +216,6 @@ private: Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext( Sequence< Any > const &rArguments, const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception, std::exception ) { (void)rArguments; return createInstanceWithContext( ctx ); @@ -237,7 +223,6 @@ Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgument Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithContext( const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception, std::exception ) { if( ! m_theInstance.is() ) { diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index 9217b8825d27..91485855af39 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -82,40 +82,32 @@ public: public: // XDriver virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; public: // XServiceInfo // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; public: // XDataDefinitionSupplier virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( - const css::uno::Reference< css::sdbc::XConnection >& connection ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XConnection >& connection ) override; virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) override; // XComponent virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx index 5a91ad938cdc..b1c35a32c2b1 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx @@ -68,7 +68,6 @@ FakedUpdateableResultSet::FakedUpdateableResultSet( css::uno::Any FakedUpdateableResultSet::queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) { Any ret = ResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -81,7 +80,6 @@ css::uno::Any FakedUpdateableResultSet::queryInterface( css::uno::Sequence< css::uno::Type > FakedUpdateableResultSet::getTypes() - throw( css::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -101,123 +99,122 @@ css::uno::Sequence< css::uno::Type > FakedUpdateableResultSet::getTypes() } css::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementationId() - throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } -void FakedUpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::insertRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::deleteRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::cancelRowUpdates( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::moveToInsertRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::moveToCurrentRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const css::uno::Sequence< sal_Int8 >& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const css::uno::Sequence< sal_Int8 >& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const css::util::Date& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const css::util::Date& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const css::util::Time& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const css::util::Time& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const css::util::DateTime& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const css::util::DateTime& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx index 1830f4186678..74ed8c8415ee 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx @@ -68,41 +68,38 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ResultSet::acquire(); } virtual void SAL_CALL release() throw() override { ResultSet::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 27a931da2919..ee75cde78e12 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -223,7 +223,7 @@ void PreparedStatement::checkColumnIndex( sal_Int32 parameterIndex ) throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any () ); } } -void PreparedStatement::checkClosed() throw (SQLException, RuntimeException ) +void PreparedStatement::checkClosed() { if( ! m_pSettings || ! m_pSettings->pConnection ) throw SQLException( @@ -231,14 +231,14 @@ void PreparedStatement::checkClosed() throw (SQLException, RuntimeException ) *this, OUString(),1,Any()); } -Any PreparedStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any PreparedStatement::queryInterface( const Type & rType ) { Any aRet = PreparedStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::exception ) +Sequence< Type > PreparedStatement::getTypes() { static Sequence< Type > *pCollection; if( ! pCollection ) @@ -256,12 +256,12 @@ Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::ex return *pCollection; } -Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeException, std::exception ) +Sequence< sal_Int8> PreparedStatement::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::exception) +void PreparedStatement::close( ) { // let the connection die without acquired mutex ! Reference< XConnection > r; @@ -282,7 +282,6 @@ void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::ex } void PreparedStatement::raiseSQLException( const char * errorMsg ) - throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); @@ -297,7 +296,6 @@ void PreparedStatement::raiseSQLException( const char * errorMsg ) } Reference< XResultSet > PreparedStatement::executeQuery( ) - throw (SQLException, RuntimeException, std::exception) { Reference< XCloseable > lastResultSet = m_lastResultset; if( lastResultSet.is() ) @@ -311,7 +309,6 @@ Reference< XResultSet > PreparedStatement::executeQuery( ) } sal_Int32 PreparedStatement::executeUpdate( ) - throw (SQLException, RuntimeException, std::exception) { if( execute( ) ) { @@ -321,7 +318,6 @@ sal_Int32 PreparedStatement::executeUpdate( ) } sal_Bool PreparedStatement::execute( ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -400,7 +396,6 @@ sal_Bool PreparedStatement::execute( ) } Reference< XConnection > PreparedStatement::getConnection( ) - throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > ret; { @@ -413,7 +408,6 @@ Reference< XConnection > PreparedStatement::getConnection( ) void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) - throw (SQLException, RuntimeException, std::exception) { (void)sqlType; MutexGuard guard( m_refMutex->mutex ); @@ -424,7 +418,6 @@ void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) void PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) - throw (SQLException, RuntimeException, std::exception) { (void) sqlType; (void) typeName; MutexGuard guard( m_refMutex->mutex ); @@ -435,7 +428,6 @@ void PreparedStatement::setObjectNull( void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -447,19 +439,16 @@ void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) } void PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) - throw (SQLException, RuntimeException, std::exception) { setInt(parameterIndex,x); } void PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) - throw (SQLException, RuntimeException, std::exception) { setInt(parameterIndex, x ); } void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) - throw (SQLException, RuntimeException, std::exception) { // printf( "setString %d %d\n ", parameterIndex, x); MutexGuard guard(m_refMutex->mutex ); @@ -473,7 +462,6 @@ void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) } void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -486,7 +474,6 @@ void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) } void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -499,7 +486,6 @@ void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) } void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -512,7 +498,6 @@ void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) } void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) - throw (SQLException, RuntimeException, std::exception) { // printf( "setString %d %s\n ", parameterIndex, // OUStringToOString( x , RTL_TEXTENCODING_ASCII_US ).getStr()); @@ -531,7 +516,6 @@ void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) void PreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -555,20 +539,17 @@ void PreparedStatement::setBytes( void PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateString( x ) ); } void PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toTimeString( x ) ); } void PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateTimeString( x ) ); } @@ -577,7 +558,6 @@ void PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; (void) length; throw SQLException( @@ -589,7 +569,6 @@ void PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; (void) length; throw SQLException( @@ -598,7 +577,6 @@ void PreparedStatement::setCharacterStream( } void PreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) - throw (SQLException, RuntimeException, std::exception) { if( ! implSetObject( this, parameterIndex, x )) { @@ -614,7 +592,6 @@ void PreparedStatement::setObjectWithInfo( const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) - throw (SQLException, RuntimeException, std::exception) { (void) scale; if( css::sdbc::DataType::DECIMAL == targetSqlType || @@ -654,7 +631,6 @@ void PreparedStatement::setObjectWithInfo( void PreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -665,7 +641,6 @@ void PreparedStatement::setRef( void PreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -676,7 +651,6 @@ void PreparedStatement::setBlob( void PreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -687,31 +661,26 @@ void PreparedStatement::setClob( void PreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, array2String( x->getArray( nullptr ) ) ); } void PreparedStatement::clearParameters( ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); m_vars = OStringVector ( m_vars.size() ); } Any PreparedStatement::getWarnings( ) - throw (SQLException,RuntimeException, std::exception) { return Any(); } void PreparedStatement::clearWarnings( ) - throw (SQLException, RuntimeException, std::exception) { } Reference< css::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() - throw (SQLException,RuntimeException, std::exception) { Reference< css::sdbc::XResultSetMetaData > ret; Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); @@ -728,7 +697,6 @@ Reference< css::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() sal_Bool PreparedStatement::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { bool bRet; rOldValue = m_props[nHandle]; @@ -775,7 +743,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue( void PreparedStatement::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) + sal_Int32 nHandle,const Any& rValue ) { m_props[nHandle] = rValue; } @@ -786,7 +754,6 @@ void PreparedStatement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c } Reference < XPropertySetInfo > PreparedStatement::getPropertySetInfo() - throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getPreparedStatementPropertyArrayHelper() ); } @@ -798,23 +765,19 @@ void PreparedStatement::disposing() Reference< XResultSet > PreparedStatement::getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 PreparedStatement::getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool PreparedStatement::getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return false; } Reference< XResultSet > PreparedStatement::getGeneratedValues( ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); return getGeneratedValuesFromLastInsert( diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx index c3fc3c8d0be2..91e94bb85724 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx @@ -105,102 +105,69 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { PreparedStatement_BASE::acquire(); } virtual void SAL_CALL release() throw() override { PreparedStatement_BASE::release(); } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; public: // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; virtual void SAL_CALL setObjectNull( - sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; virtual void SAL_CALL setBytes( - sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; virtual void SAL_CALL setTimestamp( - sal_Int32 parameterIndex, const css::util::DateTime& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 parameterIndex, const css::util::DateTime& x ) override; virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, - sal_Int32 length ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 length ) override; virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, - sal_Int32 length ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, - sal_Int32 scale ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 scale ) override; virtual void SAL_CALL setRef( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XRef >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XRef >& x ) override; virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XBlob >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XBlob >& x ) override; virtual void SAL_CALL setClob( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XClob >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XClob >& x ) override; virtual void SAL_CALL setArray( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XArray >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; public: // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -209,13 +176,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -224,26 +189,20 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // XGeneratedResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - getGeneratedValues( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + getGeneratedValues( ) override; public: // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; public: // XResultSetMetaDataSupplier (is required by framework (see // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() ) - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; public: // OComponentHelper virtual void SAL_CALL disposing() override; @@ -252,10 +211,9 @@ private: void checkColumnIndex( sal_Int32 parameterIndex ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkClosed(); /// @throws css::sdbc::SQLException - void raiseSQLException( const char * errorMsg ) - throw ( css::sdbc::SQLException ); + void raiseSQLException( const char * errorMsg ); // PGresult *pgExecute( OString *pQuery ); }; diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index e569b88da9c7..dafe25bd04f7 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -61,7 +61,6 @@ namespace pq_sdbc_driver { void ResultSet::checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) { if( ! m_result ) { @@ -130,7 +129,7 @@ Any ResultSet::getValue( sal_Int32 columnIndex ) ResultSet::~ResultSet() {} -void ResultSet::close( ) throw (SQLException, RuntimeException, std::exception) +void ResultSet::close( ) { Reference< XInterface > owner; { @@ -146,7 +145,7 @@ void ResultSet::close( ) throw (SQLException, RuntimeException, std::exception) } } -Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > ResultSet::getMetaData( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -155,7 +154,6 @@ Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, } sal_Int32 ResultSet::findColumn( const OUString& columnName ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx index 5ccf50ed0902..40e4df23e547 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx @@ -61,8 +61,7 @@ protected: protected: /** mutex should be locked before called */ - virtual void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override; + virtual void checkClosed() override; /** unchecked, acquire mutex before calling */ @@ -79,16 +78,13 @@ public: virtual ~ResultSet() override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; public: // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; public: sal_Int32 guessDataType( sal_Int32 column ); diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index 2a256a70fe14..a121354f753f 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -281,13 +281,11 @@ Reference< css::beans::XPropertySet > ResultSetMetaData::getColumnByIndex( int i // Methods sal_Int32 ResultSetMetaData::getColumnCount( ) - throw (SQLException, RuntimeException, std::exception) { return m_colCount; } sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { bool ret = getBoolColumnProperty( getStatics().IS_AUTO_INCREMENT, column, false ); @@ -295,39 +293,35 @@ sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) } sal_Bool ResultSetMetaData::isCaseSensitive( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return true; // ??? hmm, numeric types or } -sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) { (void) column; return true; // mmm, what types are not searchable ? } -sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) { return getBoolColumnProperty( getStatics().IS_CURRENCY, column, false ); } sal_Int32 ResultSetMetaData::isNullable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return getIntColumnProperty( getStatics().IS_NULLABLE, column, css::sdbc::ColumnValue::NULLABLE_UNKNOWN ); } sal_Bool ResultSetMetaData::isSigned( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return true; } sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -335,12 +329,11 @@ sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) } OUString ResultSetMetaData::getColumnLabel( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return getColumnName( column); } -OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString ResultSetMetaData::getColumnName( sal_Int32 column ) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -348,14 +341,13 @@ OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLExceptio return m_colDesc[column-1].name; } -OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) { (void) column; return m_schemaName; } sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -363,7 +355,6 @@ sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column ) } sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -371,20 +362,17 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) } OUString ResultSetMetaData::getTableName( sal_Int32 ) - throw (SQLException, RuntimeException, std::exception) { // LEM TODO This is very fishy.. Should probably return the table to which that column belongs! return m_tableName; } OUString ResultSetMetaData::getCatalogName( sal_Int32 ) - throw (SQLException, RuntimeException, std::exception) { // can do this through XConnection.getCatalog() ! return OUString(); } sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { int ret = getIntColumnProperty( getStatics().TYPE, column, -100 ); if( -100 == ret ) @@ -398,7 +386,6 @@ sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) } OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { OUString ret; // give defensive answers, when data is not available try @@ -425,32 +412,27 @@ OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) sal_Bool ResultSetMetaData::isReadOnly( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return false; } sal_Bool ResultSetMetaData::isWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return ! isReadOnly( column ); // what's the sense if this method ? } sal_Bool ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return isWritable(column); // uhh, now it becomes really esoteric .... } OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return OUString(); } void ResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_colCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx index 077368751992..70ba16e5d3b6 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx @@ -80,8 +80,7 @@ class ResultSetMetaData : /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkColumnIndex( sal_Int32 columnIndex ); void checkTable(); void checkForTypes(); css::uno::Reference< css::beans::XPropertySet > getColumnByIndex( int index ); @@ -101,27 +100,27 @@ public: public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index 7f3556d8c003..0a0b06bb4e88 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -49,8 +49,6 @@ namespace pq_sdbc_driver { void SequenceResultSet::checkClosed() - throw ( css::sdbc::SQLException, - css::uno::RuntimeException ) { // we never close :o) } @@ -85,13 +83,11 @@ SequenceResultSet::~SequenceResultSet() } void SequenceResultSet::close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { // a noop } Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { if( ! m_meta.is() ) { @@ -109,7 +105,6 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) sal_Int32 SAL_CALL SequenceResultSet::findColumn( const OUString& columnName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { // no need to guard, as all members are readonly ! for( int i = 0 ;i < m_fieldCount ; i ++ ) diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx index 1f43cfa526d4..bf22e9de8d52 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx @@ -62,8 +62,7 @@ protected: protected: /** mutex should be locked before called */ - virtual void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override; + virtual void checkClosed() override; /** unchecked, acquire mutex before calling */ @@ -80,16 +79,13 @@ public: virtual ~SequenceResultSet() override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; public: // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index 9b4ed4d8a9de..bde1ac37ec92 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -58,69 +58,62 @@ SequenceResultSetMetaData::SequenceResultSetMetaData( // Methods sal_Int32 SequenceResultSetMetaData::getColumnCount( ) - throw (SQLException, RuntimeException, std::exception) { return m_colCount; } sal_Bool SequenceResultSetMetaData::isAutoIncrement( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].isAutoIncrement; } sal_Bool SequenceResultSetMetaData::isCaseSensitive( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return true; // ??? hmm, numeric types or } -sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ ) { return true; // mmm, what types are not searchable ? } -sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex( column ); return m_columnData[column-1].isCurrency; } sal_Int32 SequenceResultSetMetaData::isNullable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].isNullable ? 1 : 0; } sal_Bool SequenceResultSetMetaData::isSigned( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return true; } sal_Int32 SequenceResultSetMetaData::getColumnDisplaySize( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return 50; } OUString SequenceResultSetMetaData::getColumnLabel( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) { checkColumnIndex( column ); return m_columnData[column-1].schemaTableName; @@ -128,41 +121,35 @@ OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQL sal_Int32 SequenceResultSetMetaData::getPrecision( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].precision; } sal_Int32 SequenceResultSetMetaData::getScale( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].scale; } OUString SequenceResultSetMetaData::getTableName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].tableName; } OUString SequenceResultSetMetaData::getCatalogName( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { // can do this through XConnection.getCatalog() ! return OUString(); } sal_Int32 SequenceResultSetMetaData::getColumnType( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].type; } OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].typeName; @@ -170,30 +157,25 @@ OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) sal_Bool SequenceResultSetMetaData::isReadOnly( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return false; } sal_Bool SequenceResultSetMetaData::isWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return ! isReadOnly( column ); // what's the sense if this method ? } sal_Bool SequenceResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return isWritable(column); // uhh, now it becomes really esoteric .... } OUString SequenceResultSetMetaData::getColumnServiceName( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return OUString(); } void SequenceResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_colCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx index d115b8f750c5..2bba06aa7d2f 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx @@ -53,8 +53,7 @@ namespace pq_sdbc_driver /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkColumnIndex( sal_Int32 columnIndex ); public: SequenceResultSetMetaData( @@ -63,27 +62,27 @@ namespace pq_sdbc_driver public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index e465fa254ed9..26910e33fc30 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -176,7 +176,7 @@ Statement::~Statement() POSTGRE_TRACE( "dtor Statement" ); } -void Statement::checkClosed() throw (SQLException, RuntimeException ) +void Statement::checkClosed() { if( ! m_pSettings || ! m_pSettings->pConnection ) throw SQLException( @@ -184,14 +184,14 @@ void Statement::checkClosed() throw (SQLException, RuntimeException ) *this, OUString(),1,Any()); } -Any Statement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any Statement::queryInterface( const Type & rType ) { Any aRet = Statement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception ) +Sequence< Type > Statement::getTypes() { static Sequence< Type > *pCollection; if( ! pCollection ) @@ -209,12 +209,12 @@ Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception return *pCollection; } -Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException, std::exception ) +Sequence< sal_Int8> Statement::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -void Statement::close( ) throw (SQLException, RuntimeException, std::exception) +void Statement::close( ) { // let the connection die without acquired mutex ! Reference< XConnection > r; @@ -238,7 +238,6 @@ void Statement::close( ) throw (SQLException, RuntimeException, std::exception) void Statement::raiseSQLException( const OUString & sql, const char * errorMsg ) - throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); @@ -253,7 +252,6 @@ void Statement::raiseSQLException( } Reference< XResultSet > Statement::executeQuery(const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { Reference< XCloseable > lastResultSetHolder = m_lastResultset; if( lastResultSetHolder.is() ) @@ -267,7 +265,6 @@ Reference< XResultSet > Statement::executeQuery(const OUString& sql ) } sal_Int32 Statement::executeUpdate( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { if( execute( sql ) ) { @@ -283,7 +280,6 @@ static void raiseSQLException( const OString & sql, const char * errorMsg, const char *errorType = nullptr ) - throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); @@ -824,7 +820,6 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( } sal_Bool Statement::execute( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -850,7 +845,6 @@ sal_Bool Statement::execute( const OUString& sql ) } Reference< XConnection > Statement::getConnection( ) - throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > ret; { @@ -863,18 +857,15 @@ Reference< XConnection > Statement::getConnection( ) Any Statement::getWarnings( ) - throw (SQLException,RuntimeException, std::exception) { return Any(); } void Statement::clearWarnings( ) - throw (SQLException, RuntimeException, std::exception) { } Reference< css::sdbc::XResultSetMetaData > Statement::getMetaData() - throw (SQLException,RuntimeException, std::exception) { Reference< css::sdbc::XResultSetMetaData > ret; Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); @@ -892,7 +883,6 @@ Reference< css::sdbc::XResultSetMetaData > Statement::getMetaData() sal_Bool Statement::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { rOldValue = m_props[nHandle]; bool bRet; @@ -939,7 +929,7 @@ sal_Bool Statement::convertFastPropertyValue( void Statement::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) + sal_Int32 nHandle,const Any& rValue ) { m_props[nHandle] = rValue; } @@ -950,26 +940,22 @@ void Statement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } Reference < XPropertySetInfo > Statement::getPropertySetInfo() - throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getStatementPropertyArrayHelper() ); } Reference< XResultSet > Statement::getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 Statement::getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool Statement::getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return false; } @@ -981,7 +967,6 @@ void Statement::disposing() } Reference< XResultSet > Statement::getGeneratedValues( ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); return getGeneratedValuesFromLastInsert( diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx index 437eac12c0e6..0ac5e40a711e 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.hxx +++ b/connectivity/source/drivers/postgresql/pq_statement.hxx @@ -98,35 +98,25 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { Statement_BASE::acquire(); } virtual void SAL_CALL release() throw() override { Statement_BASE::release(); } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; public: // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -135,13 +125,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -150,37 +138,30 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // XGeneratedResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - getGeneratedValues( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + getGeneratedValues( ) override; public: // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; public: // OComponentHelper virtual void SAL_CALL disposing() override; public: // XResultSetMetaDataSupplier (is required by framework (see // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() ) - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkClosed(); /// @throws css::sdbc::SQLException - void raiseSQLException( const OUString & sql, const char * errorMsg ) - throw ( css::sdbc::SQLException ); + void raiseSQLException( const OUString & sql, const char * errorMsg ); }; diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index b5799eadfdad..efecdac1fad9 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -598,7 +598,7 @@ OUString array2String( const css::uno::Sequence< Any > &seq ) } -std::vector< Any > parseArray( const OUString & str ) throw( SQLException ) +std::vector< Any > parseArray( const OUString & str ) { int len = str.getLength(); bool doubleQuote = false; diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index cce2d5a640f4..ad642f724f8c 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -104,8 +104,7 @@ void tokenizeSQL( const OString & sql, OStringVector &vec ); void splitSQL( const OString & sql, OStringVector &vec ); std::vector< sal_Int32 > parseIntArray( const OUString & str ); /// @throws css::sdbc::SQLException -std::vector< css::uno::Any > parseArray( const OUString & str ) - throw( css::sdbc::SQLException ); +std::vector< css::uno::Any > parseArray( const OUString & str ); OUString array2String( const css::uno::Sequence< css::uno::Any > &seq ); diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index 64033eb9d647..3ec872e448de 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -134,7 +134,6 @@ css::uno::Reference< css::sdbc::XCloseable > UpdateableResultSet::createFromPGRe css::uno::Any UpdateableResultSet::queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) { Any ret = SequenceResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -147,7 +146,6 @@ css::uno::Any UpdateableResultSet::queryInterface( css::uno::Sequence< css::uno::Type > UpdateableResultSet::getTypes() - throw( css::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -167,7 +165,6 @@ css::uno::Sequence< css::uno::Type > UpdateableResultSet::getTypes() } css::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationId() - throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -194,7 +191,7 @@ OUString UpdateableResultSet::buildWhereClause() } -void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::insertRow( ) { MutexGuard guard( m_refMutex->mutex ); if (isLog(*m_ppSettings, LogLevel::Info)) @@ -288,7 +285,7 @@ void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, s m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateRow( ) { MutexGuard guard( m_refMutex->mutex ); if (isLog(*m_ppSettings, LogLevel::Info)) @@ -338,7 +335,7 @@ void UpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, s m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::deleteRow( ) { if (isLog(*m_ppSettings, LogLevel::Info)) { @@ -377,18 +374,18 @@ void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, s m_data.resize( m_rowCount ); } -void UpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::cancelRowUpdates( ) { MutexGuard guard( m_refMutex->mutex ); m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::moveToInsertRow( ) { m_insertRow = true; } -void UpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::moveToCurrentRow( ) { m_insertRow = false; } @@ -401,7 +398,7 @@ void UpdateableResultSet::checkUpdate( sal_Int32 columnIndex) m_updateableField[columnIndex-1].isTouched = true; } -void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -409,7 +406,7 @@ void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLExceptio m_updateableField[columnIndex-1].value = Any(); } -void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -420,17 +417,17 @@ void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) thr } -void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateInt(columnIndex,x); } -void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateInt( columnIndex, x ); } -void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateLong( columnIndex, x ); // MutexGuard guard( m_refMutex->mutex ); @@ -441,7 +438,7 @@ void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw } -void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -454,7 +451,7 @@ void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw m_updateableField[columnIndex-1].value <<= OUString::number( x ); } -void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) { MutexGuard guard( m_refMutex->mutex ); @@ -464,7 +461,7 @@ void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (S m_updateableField[columnIndex-1].value <<= OUString::number( x ); } -void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -473,7 +470,7 @@ void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw m_updateableField[columnIndex-1].value <<= OUString::number( x ); } -void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -482,7 +479,7 @@ void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x m_updateableField[columnIndex-1].value <<= x; } -void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -504,40 +501,39 @@ void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Se free( escapedString ); } -void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { updateString( columnIndex, DBTypeConversion::toDateString( x ) ); } -void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { updateString( columnIndex, DBTypeConversion::toTimeString( x ) ); } -void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { updateString( columnIndex, DBTypeConversion::toDateTimeString( x ) ); } -void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { } -void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { } -void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) { } -void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) { } Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable ) - throw( css::uno::RuntimeException ) { if( updateable ) { diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index 040281dec8fb..a1e5f5d44033 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -126,46 +126,42 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { SequenceResultSet::acquire(); } virtual void SAL_CALL release() throw() override { SequenceResultSet::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; public: /// @throws css::uno::RuntimeException - static css::uno::Sequence< css::uno::Type > getStaticTypes( bool updateable ) - throw( css::uno::RuntimeException ); + static css::uno::Sequence< css::uno::Type > getStaticTypes( bool updateable ); }; diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index 45f37fe0430c..627e60fe4ca3 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -85,7 +85,6 @@ sal_Bool ReflectionBase::convertFastPropertyValue( css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) { rOldValue = m_values[nHandle]; @@ -113,7 +112,6 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public( void ReflectionBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) { // OUString s; // rValue >>= s; @@ -135,32 +133,27 @@ void ReflectionBase::getFastPropertyValue( } Reference < css::beans::XPropertySetInfo > ReflectionBase::getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( m_propsDesc ); } OUString ReflectionBase::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return m_implName; } sal_Bool ReflectionBase::supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > ReflectionBase::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return m_supportedServices; } Sequence< css::uno::Type > ReflectionBase::getTypes() - throw( css::uno::RuntimeException, std::exception ) { osl::MutexGuard guard( m_refMutex->mutex ); static Sequence< css::uno::Type > collection( @@ -173,14 +166,13 @@ Sequence< css::uno::Type > ReflectionBase::getTypes() css::uno::Any ReflectionBase::queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) { Any ret = ReflectionBase_BASE::queryInterface( reqType ); return ret.hasValue() ? ret : OPropertySetHelper::queryInterface( reqType ); } -Sequence< sal_Int8> ReflectionBase::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> ReflectionBase::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -202,7 +194,7 @@ void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set ) } } -OUString ReflectionBase::getName( ) throw (css::uno::RuntimeException, std::exception) +OUString ReflectionBase::getName( ) { Statics & st = getStatics(); if( getInfoHelper().hasPropertyByName( st.SCHEMA_NAME ) ) @@ -215,7 +207,6 @@ OUString ReflectionBase::getName( ) throw (css::uno::RuntimeException, std::exc void ReflectionBase::setName( const OUString& /* aName */ ) - throw (css::uno::RuntimeException, std::exception) { throw RuntimeException( "pq_sdbc::ReflectionBase::setName not implemented", diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx index 17e2e0f70455..bf5359fe5fc4 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -85,8 +85,7 @@ public: //XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase_BASE::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase_BASE::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -95,13 +94,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -110,30 +107,24 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override = 0; + createDataDescriptor( ) override = 0; public: // XNamed - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index f8c3c2747aef..5caf2d0f88af 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -57,7 +57,7 @@ Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.column.pProps ) {} -Reference< XPropertySet > Column::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Column::createDataDescriptor( ) { ColumnDescriptor * pColumn = new ColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -78,7 +78,7 @@ ColumnDescriptor::ColumnDescriptor( *getStatics().refl.columnDescriptor.pProps ) {} -Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) { ColumnDescriptor * pColumn = new ColumnDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx index 3b833845f4f0..1a8d9ff30502 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx @@ -58,7 +58,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -72,7 +72,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index 36f3a4f8744c..da43c62d7b36 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -276,7 +276,6 @@ OUString columnMetaData2SDBCX( // }; void Columns::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -461,9 +460,6 @@ void alterColumnByDescriptor( void Columns::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& future ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); @@ -498,9 +494,6 @@ void Columns::appendByDescriptor( // } void Columns::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -535,7 +528,6 @@ void Columns::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Columns::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -566,7 +558,6 @@ ColumnDescriptors::ColumnDescriptors( Reference< css::beans::XPropertySet > ColumnDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx index d7d8e92d3ffe..d8ca464653ce 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx @@ -83,27 +83,20 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; // public: // XDrop // virtual void SAL_CALL dropByName( const OUString& elementName ) // throw (css::sdbc::SQLException, // css::container::NoSuchElementException, // css::uno::RuntimeException); - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -116,8 +109,7 @@ public: ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx index cc46f7ae93ec..2710f8bf2748 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx @@ -146,7 +146,6 @@ Container::Container( } Any Container::getByName( const OUString& aName ) - throw (NoSuchElementException,WrappedTargetException,RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( aName ); if( ii == m_name2index.end() ) @@ -164,7 +163,6 @@ Any Container::getByName( const OUString& aName ) } Sequence< OUString > Container::getElementNames( ) - throw (css::uno::RuntimeException, std::exception) { Sequence< OUString > ret( m_values.size() ); for( String2IntMap::const_iterator ii = m_name2index.begin(); @@ -179,27 +177,21 @@ Sequence< OUString > Container::getElementNames( ) } sal_Bool Container::hasByName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) { return m_name2index.find( aName ) != m_name2index.end(); } // Methods Type Container::getElementType( ) - throw (css::uno::RuntimeException, std::exception) { return Type(); } sal_Bool Container::hasElements( ) - throw (css::uno::RuntimeException, std::exception) { return ! m_name2index.empty(); } Any Container::getByIndex( sal_Int32 Index ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if( Index < 0 || Index >= (sal_Int32)m_values.size() ) { @@ -216,7 +208,6 @@ Any Container::getByIndex( sal_Int32 Index ) } sal_Int32 Container::getCount() - throw (css::uno::RuntimeException, std::exception) { return m_values.size(); } @@ -234,25 +225,17 @@ public: public: // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement( ) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual css::uno::Any SAL_CALL nextElement( ) override; }; sal_Bool ContainerEnumeration::hasMoreElements() - throw (css::uno::RuntimeException, std::exception) { return (int)m_vec.size() > m_index +1; } css::uno::Any ContainerEnumeration::nextElement() - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if( ! hasMoreElements() ) { @@ -264,21 +247,18 @@ css::uno::Any ContainerEnumeration::nextElement() } Reference< XEnumeration > Container::createEnumeration( ) - throw (css::uno::RuntimeException, std::exception) { return new ContainerEnumeration( m_values ); } void Container::addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l ); } void Container::removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l ); } @@ -307,9 +287,6 @@ void Container::rename( const OUString &oldName, const OUString &newName ) } void Container::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); String2IntMap::const_iterator ii = m_name2index.find( elementName ); @@ -332,9 +309,6 @@ void Container::dropByName( const OUString& elementName ) } void Container::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >=(sal_Int32)m_values.size() ) @@ -387,7 +361,6 @@ void Container::dropByIndex( sal_Int32 index ) void Container::append( const OUString & name, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw ( css::container::ElementExistException ) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -413,9 +386,6 @@ void Container::append( void Container::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { append( extractStringProperty( descriptor, getStatics().NAME ), descriptor ); } @@ -423,14 +393,12 @@ void Container::appendByDescriptor( void Container::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l ); } void Container::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l ); } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 6c7a80c113f9..fd595c639e08 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -123,81 +123,55 @@ public: ); public: // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; public: // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > - SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL createEnumeration( ) override; public: // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Methods - virtual css::uno::Type SAL_CALL getElementType( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; public: // XAppend // Must be overridden in Non-Descriptors. May be overridden in descriptors, when // PropertySet.NAME != container name virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; // helper method ! /// @throws css::container::ElementExistException void append( const OUString & str, - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw ( css::container::ElementExistException ); + const css::uno::Reference< css::beans::XPropertySet >& descriptor ); public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override = 0; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL refresh( ) override {} virtual void SAL_CALL addRefreshListener( - const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener >& l ) override; virtual void SAL_CALL removeRefreshListener( - const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener >& l ) override; public: // Methods virtual void SAL_CALL addContainerListener( - const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XContainerListener >& xListener ) override; virtual void SAL_CALL removeContainerListener( - const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XContainerListener >& xListener ) override; public: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 688d1d77a40c..60169554e9d6 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -78,7 +78,7 @@ Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex, m_tableName( tableName ) {} -Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Index::createDataDescriptor( ) { IndexDescriptor * pIndex = new IndexDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -87,7 +87,7 @@ Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > Index::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Index::getColumns( ) { if( ! m_indexColumns.is() ) { @@ -101,7 +101,7 @@ Reference< XNameAccess > Index::getColumns( ) throw (css::uno::RuntimeException return m_indexColumns; } -Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > Index::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -118,12 +118,12 @@ Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> Index::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> Index::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any Index::queryInterface( const Type & reqType ) { Any ret; @@ -149,7 +149,7 @@ IndexDescriptor::IndexDescriptor( * getStatics().refl.indexDescriptor.pProps ) {} -Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) { IndexDescriptor * pIndex = new IndexDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -157,7 +157,7 @@ Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (Runti return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > IndexDescriptor::getColumns( ) { if( ! m_indexColumns.is() ) { @@ -173,7 +173,7 @@ Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (css::uno::Runtim return m_indexColumns; } -Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > IndexDescriptor::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -190,12 +190,12 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::except return pCollection->getTypes(); } -Sequence< sal_Int8> IndexDescriptor::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> IndexDescriptor::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any IndexDescriptor::queryInterface( const Type & reqType ) { Any ret; diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx index 89795324127c..7f22f1215575 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx @@ -69,22 +69,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -104,22 +101,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx index bb01c7f30423..ef2ceffebaa7 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx @@ -57,7 +57,7 @@ IndexColumn::IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.indexColumn.pProps ) {} -Reference< XPropertySet > IndexColumn::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > IndexColumn::createDataDescriptor( ) { IndexColumnDescriptor * pIndexColumn = new IndexColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -80,7 +80,7 @@ IndexColumnDescriptor::IndexColumnDescriptor( * getStatics().refl.indexColumnDescriptor.pProps ) {} -Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor( ) { IndexColumnDescriptor * pIndexColumn = new IndexColumnDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx index 42c249b64958..9dada6d18b10 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx @@ -59,7 +59,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -73,7 +73,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index b8b4738a045a..09caf4829691 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -101,7 +101,6 @@ static sal_Int32 findInSequence( const Sequence< OUString > & seq , const OUStri } void IndexColumns::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -157,9 +156,6 @@ void IndexColumns::refresh() void IndexColumns::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& /*future*/ ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { throw css::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.appendByDescriptor not yet implemented", @@ -174,9 +170,6 @@ void IndexColumns::appendByDescriptor( } void IndexColumns::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { (void) elementName; throw css::sdbc::SQLException( @@ -200,9 +193,6 @@ void IndexColumns::dropByName( const OUString& elementName ) } void IndexColumns::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { (void) index; throw css::sdbc::SQLException( @@ -240,7 +230,6 @@ void IndexColumns::dropByIndex( sal_Int32 index ) Reference< css::beans::XPropertySet > IndexColumns::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -279,7 +268,6 @@ Reference< css::container::XNameAccess > IndexColumnDescriptors::create( } css::uno::Reference< css::beans::XPropertySet > IndexColumnDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx index 7134316a05e4..9c1b856dbfd4 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx @@ -73,27 +73,17 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -113,8 +103,7 @@ protected: ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index b5f2c871eff0..19001cf040ea 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -90,7 +90,6 @@ Indexes::~Indexes() {} void Indexes::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -190,9 +189,6 @@ void Indexes::refresh() void Indexes::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { Statics & st = getStatics(); OUString name = extractStringProperty( descriptor, st.NAME ); @@ -241,9 +237,6 @@ void Indexes::appendByDescriptor( } void Indexes::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { @@ -274,7 +267,6 @@ void Indexes::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Indexes::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -309,7 +301,6 @@ Reference< css::container::XNameAccess > IndexDescriptors::create( } css::uno::Reference< css::beans::XPropertySet > IndexDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.hxx b/connectivity/source/drivers/postgresql/pq_xindexes.hxx index 34d15b53df58..a4d0e48d9467 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx @@ -66,23 +66,16 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -101,8 +94,7 @@ protected: ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index ac15478a9282..0e3ab48782e4 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -78,7 +78,7 @@ Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex, m_tableName( tableName ) {} -Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Key::createDataDescriptor( ) { KeyDescriptor * pKeyDescriptor = new KeyDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -87,7 +87,7 @@ Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException, return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > Key::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Key::getColumns( ) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -103,7 +103,7 @@ Reference< XNameAccess > Key::getColumns( ) throw (css::uno::RuntimeException, return m_keyColumns; } -Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > Key::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -120,12 +120,12 @@ Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> Key::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> Key::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any Key::queryInterface( const Type & reqType ) { Any ret; @@ -151,7 +151,7 @@ KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMut { } -Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) { KeyDescriptor * pKeyDescriptor = new KeyDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -160,7 +160,7 @@ Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (Runtime return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > KeyDescriptor::getColumns( ) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -170,7 +170,7 @@ Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (css::uno::RuntimeE return m_keyColumns; } -Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > KeyDescriptor::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -187,12 +187,12 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exceptio return pCollection->getTypes(); } -Sequence< sal_Int8> KeyDescriptor::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> KeyDescriptor::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any KeyDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any KeyDescriptor::queryInterface( const Type & reqType ) { Any ret; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx index c416a9438b60..1b22047e89c4 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx @@ -69,22 +69,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -102,22 +99,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx index 4493bd8a91ae..57c4f400067a 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx @@ -57,7 +57,7 @@ KeyColumn::KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.keycolumn.pProps ) {} -Reference< XPropertySet > KeyColumn::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > KeyColumn::createDataDescriptor( ) { KeyColumnDescriptor * pKeyColumn = new KeyColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -79,7 +79,7 @@ KeyColumnDescriptor::KeyColumnDescriptor( * getStatics().refl.keycolumnDescriptor.pProps ) {} -Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor( ) { KeyColumnDescriptor * pKeyColumn = new KeyColumnDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx index 2c7ff37235a5..bf102777b730 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx @@ -58,7 +58,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -72,7 +72,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index e5e1ddb748c8..47dd4d2442b0 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -87,7 +87,6 @@ KeyColumns::~KeyColumns() void KeyColumns::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -159,9 +158,6 @@ void KeyColumns::refresh() void KeyColumns::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& future ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { (void) future; throw css::sdbc::SQLException( @@ -179,9 +175,6 @@ void KeyColumns::appendByDescriptor( void KeyColumns::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { (void) index; throw css::sdbc::SQLException( @@ -219,7 +212,6 @@ void KeyColumns::dropByIndex( sal_Int32 index ) Reference< css::beans::XPropertySet > KeyColumns::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -250,7 +242,6 @@ KeyColumnDescriptors::KeyColumnDescriptors( {} Reference< css::beans::XPropertySet > KeyColumnDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx index 6d60413ab8ca..2c5d1a7c34a3 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx @@ -73,23 +73,16 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -102,8 +95,7 @@ public: ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } #endif diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx index ddfbdbca7d56..4fd0f3390544 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx @@ -106,7 +106,6 @@ static sal_Int32 string2keyrule( const OUString & rule ) } void Keys::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -207,9 +206,6 @@ void Keys::refresh() void Keys::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -226,9 +222,6 @@ void Keys::appendByDescriptor( void Keys::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -257,7 +250,6 @@ void Keys::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Keys::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -292,7 +284,6 @@ Reference< css::container::XIndexAccess > KeyDescriptors::create( } css::uno::Reference< css::beans::XPropertySet > KeyDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.hxx b/connectivity/source/drivers/postgresql/pq_xkeys.hxx index df0f21b7b619..27ec7c64ca62 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx @@ -66,23 +66,16 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -101,8 +94,7 @@ protected: ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index ddc96f61aaa8..8da4a6d4f406 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -88,7 +88,7 @@ Table::Table( const ::rtl::Reference< RefCountedMutex > & refMutex, m_pColumns( nullptr ) {} -Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Table::createDataDescriptor( ) { TableDescriptor * pTable = new TableDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -97,7 +97,7 @@ Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pTable ); } -Reference< XNameAccess > Table::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Table::getColumns( ) { if( ! m_columns.is() ) { @@ -112,7 +112,7 @@ Reference< XNameAccess > Table::getColumns( ) throw (css::uno::RuntimeException return m_columns; } -Reference< XNameAccess > Table::getIndexes() throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Table::getIndexes() { if( ! m_indexes.is() ) { @@ -126,7 +126,7 @@ Reference< XNameAccess > Table::getIndexes() throw (css::uno::RuntimeException, return m_indexes; } -Reference< XIndexAccess > Table::getKeys( ) throw (css::uno::RuntimeException, std::exception) +Reference< XIndexAccess > Table::getKeys( ) { if( ! m_keys.is() ) { @@ -141,9 +141,6 @@ Reference< XIndexAccess > Table::getKeys( ) throw (css::uno::RuntimeException, } void Table::rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); @@ -229,7 +226,6 @@ void Table::rename( const OUString& newName ) void Table::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) - throw (SQLException,NoSuchElementException,RuntimeException, std::exception) { Reference< css::container::XNameAccess > columns = Reference< css::container::XNameAccess > ( getColumns(), UNO_QUERY ); @@ -253,7 +249,6 @@ void Table::alterColumnByName( void Table::alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (SQLException,IndexOutOfBoundsException,RuntimeException, std::exception) { Reference< css::container::XIndexAccess > columns = Reference< css::container::XIndexAccess>( getColumns(), UNO_QUERY ); @@ -268,7 +263,7 @@ void Table::alterColumnByIndex( m_pColumns->refresh(); } -Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > Table::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -289,12 +284,12 @@ Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> Table::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> Table::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any Table::queryInterface( const Type & reqType ) { Any ret; @@ -311,7 +306,7 @@ Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std:: return ret; } -OUString Table::getName( ) throw (css::uno::RuntimeException, std::exception) +OUString Table::getName( ) { Statics & st = getStatics(); return concatQualified( @@ -319,7 +314,7 @@ OUString Table::getName( ) throw (css::uno::RuntimeException, std::exception) extractStringProperty( this, st.NAME ) ); } -void Table::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) +void Table::setName( const OUString& aName ) { rename( aName ); } @@ -339,7 +334,7 @@ TableDescriptor::TableDescriptor( { } -Reference< XNameAccess > TableDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > TableDescriptor::getColumns( ) { if( ! m_columns.is() ) { @@ -348,7 +343,7 @@ Reference< XNameAccess > TableDescriptor::getColumns( ) throw (css::uno::Runtim return m_columns; } -Reference< XNameAccess > TableDescriptor::getIndexes() throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > TableDescriptor::getIndexes() { if( ! m_indexes.is() ) { @@ -360,7 +355,7 @@ Reference< XNameAccess > TableDescriptor::getIndexes() throw (css::uno::RuntimeE return m_indexes; } -Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (css::uno::RuntimeException, std::exception) +Reference< XIndexAccess > TableDescriptor::getKeys( ) { if( ! m_keys.is() ) { @@ -373,7 +368,7 @@ Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (css::uno::RuntimeE } -Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > TableDescriptor::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -392,12 +387,12 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::except return pCollection->getTypes(); } -Sequence< sal_Int8> TableDescriptor::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> TableDescriptor::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any TableDescriptor::queryInterface( const Type & reqType ) { Any ret; @@ -412,7 +407,7 @@ Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept } -Reference< XPropertySet > TableDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > TableDescriptor::createDataDescriptor( ) { TableDescriptor * pTable = new TableDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index 759dddad8a68..09fe3cbac88c 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -77,55 +77,43 @@ public: virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; // XIndexesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getIndexes( ) throw (css::uno::RuntimeException, std::exception) override; + getIndexes( ) override; // XKeysSupplier virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getKeys( ) throw (css::uno::RuntimeException, std::exception) override; + getKeys( ) override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) override; // XAlterTable virtual void SAL_CALL alterColumnByName( const OUString& colName, - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; }; @@ -149,30 +137,27 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XIndexesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getIndexes( ) throw (css::uno::RuntimeException, std::exception) override; + getIndexes( ) override; public: // XKeysSupplier virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getKeys( ) throw (css::uno::RuntimeException, std::exception) override; + getKeys( ) override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx index cbd5c3f2b695..b5d39baa276d 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx @@ -82,7 +82,6 @@ Tables::~Tables() {} void Tables::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -236,9 +235,6 @@ static void appendKeyList( void Tables::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Reference< XStatement > stmt = @@ -313,9 +309,6 @@ void Tables::appendByDescriptor( } void Tables::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -355,7 +348,6 @@ void Tables::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Tables::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new TableDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx index 9eb675e3f933..a3390cc2c1c3 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx @@ -62,27 +62,20 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop // virtual void SAL_CALL dropByName( const OUString& elementName ) // throw (css::sdbc::SQLException, // css::container::NoSuchElementException, // css::uno::RuntimeException); - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; protected: using Container::disposing; diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx index 6b32bd667e72..e1471cb0a2ee 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.cxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx @@ -74,7 +74,7 @@ User::User( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.user.pProps ) {} -Reference< XPropertySet > User::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > User::createDataDescriptor( ) { UserDescriptor * pUser = new UserDescriptor( m_refMutex, m_conn, m_pSettings ); pUser->copyValuesFrom( this ); @@ -83,7 +83,7 @@ Reference< XPropertySet > User::createDataDescriptor( ) throw (RuntimeException } -Sequence<Type > User::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > User::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -100,12 +100,12 @@ Sequence<Type > User::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> User::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> User::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any User::queryInterface( const Type & reqType ) { Any ret; @@ -120,7 +120,6 @@ Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::e void User::changePassword( const OUString& oldPassword, const OUString& newPassword ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) oldPassword; OUStringBuffer buf(128); @@ -134,7 +133,6 @@ void User::changePassword( } sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { sal_Int32 ret = 0xffffffff; if (isLog(m_pSettings, LogLevel::Info)) @@ -152,7 +150,6 @@ sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) } sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; // all privileges @@ -160,7 +157,6 @@ sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objTy } void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", @@ -168,7 +164,6 @@ void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int3 } void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", @@ -189,7 +184,7 @@ UserDescriptor::UserDescriptor( * getStatics().refl.userDescriptor.pProps ) {} -Reference< XPropertySet > UserDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > UserDescriptor::createDataDescriptor( ) { UserDescriptor * pUser = new UserDescriptor( m_refMutex, m_conn, m_pSettings ); pUser->copyValuesFrom( this ); diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx index 68ee639201b2..445e6814ec0f 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.hxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx @@ -62,25 +62,22 @@ public: virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; // XUser : XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) override; }; class UserDescriptor : public ReflectionBase @@ -93,7 +90,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx index e92158e823d4..aae6c1b551f7 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.cxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx @@ -72,7 +72,6 @@ Users::~Users() {} void Users::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -118,9 +117,6 @@ void Users::refresh() void Users::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -136,9 +132,6 @@ void Users::appendByDescriptor( } void Users::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) @@ -154,9 +147,6 @@ void Users::dropByName( const OUString& elementName ) } void Users::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -188,7 +178,6 @@ void Users::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Users::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new UserDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xusers.hxx b/connectivity/source/drivers/postgresql/pq_xusers.hxx index 6ecddfe302ff..ef05a2b1307c 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.hxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx @@ -61,27 +61,17 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; protected: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index c42f533a410f..3a85d52cc510 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -78,7 +78,7 @@ View::View( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.view.pProps ) {} -Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > View::createDataDescriptor( ) { ViewDescriptor * pView = new ViewDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -88,9 +88,6 @@ Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException } void View::rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -158,7 +155,7 @@ void View::rename( const OUString& newName ) } } -Sequence<Type > View::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > View::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -175,12 +172,12 @@ Sequence<Type > View::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> View::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> View::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any View::queryInterface( const Type & reqType ) { Any ret; @@ -193,7 +190,7 @@ Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::e return ret; } -OUString View::getName( ) throw (css::uno::RuntimeException, std::exception) +OUString View::getName( ) { Statics & st = getStatics(); return concatQualified( @@ -201,7 +198,7 @@ OUString View::getName( ) throw (css::uno::RuntimeException, std::exception) extractStringProperty( this, st.NAME ) ); } -void View::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) +void View::setName( const OUString& aName ) { rename( aName ); } @@ -220,7 +217,7 @@ ViewDescriptor::ViewDescriptor( * getStatics().refl.viewDescriptor.pProps ) {} -Reference< XPropertySet > ViewDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > ViewDescriptor::createDataDescriptor( ) { ViewDescriptor * pView = new ViewDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx index 7b9270420b2c..39fdc0d7f69c 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.hxx +++ b/connectivity/source/drivers/postgresql/pq_xview.hxx @@ -61,28 +61,22 @@ public: virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; }; @@ -96,7 +90,7 @@ public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index cd12d586687c..311fb888494a 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -73,7 +73,6 @@ Views::~Views() {} void Views::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -132,9 +131,6 @@ void Views::refresh() void Views::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -163,9 +159,6 @@ void Views::appendByDescriptor( } void Views::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) @@ -179,9 +172,6 @@ void Views::dropByName( const OUString& elementName ) } void Views::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -210,7 +200,6 @@ void Views::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Views::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new ViewDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx index 1debff30d494..bfca9392529f 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.hxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx @@ -62,27 +62,17 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; protected: using Container::disposing; |