diff options
Diffstat (limited to 'connectivity/source/drivers/mork')
20 files changed, 622 insertions, 652 deletions
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) |