diff options
Diffstat (limited to 'connectivity/source/drivers/postgresql')
64 files changed, 862 insertions, 1462 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx index 508174b18fb7..cf4b439527f2 100644 --- a/connectivity/source/drivers/postgresql/pq_array.cxx +++ b/connectivity/source/drivers/postgresql/pq_array.cxx @@ -55,20 +55,17 @@ namespace pq_sdbc_driver OUString Array::getBaseTypeName( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return OUString( "varchar" ); } sal_Int32 Array::getBaseType( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return css::sdbc::DataType::VARCHAR; } css::uno::Sequence< css::uno::Any > Array::getArray( const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return comphelper::containerToSequence(m_data); } @@ -77,7 +74,6 @@ css::uno::Sequence< css::uno::Any > Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkRange( index, count ); return Sequence< Any > ( &m_data[index-1], count ); @@ -85,7 +81,6 @@ css::uno::Sequence< css::uno::Any > Array::getArrayAtIndex( css::uno::Reference< css::sdbc::XResultSet > Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return getResultSetAtIndex( 0 , m_data.size() , typeMap ); } @@ -94,7 +89,6 @@ css::uno::Reference< css::sdbc::XResultSet > Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkRange( index, count ); std::vector< std::vector< Any > > ret( count ); diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx index 26581c6dced3..41f5ee9f7056 100644 --- a/connectivity/source/drivers/postgresql/pq_array.hxx +++ b/connectivity/source/drivers/postgresql/pq_array.hxx @@ -67,32 +67,26 @@ public: public: // XArray // Methods - virtual OUString SAL_CALL getBaseTypeName( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getBaseTypeName( ) override; - virtual sal_Int32 SAL_CALL getBaseType( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBaseType( ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArray( - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArrayAtIndex( sal_Int32 index, sal_Int32 count, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSetAtIndex( sal_Int32 index, sal_Int32 count, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; private: void checkRange( sal_Int32 index, sal_Int32 count ); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 71cb91b0b4be..5336ef24188f 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -151,7 +151,7 @@ BaseResultSet::~BaseResultSet() POSTGRE_TRACE( "dtor BaseResultSet" ); } -Any BaseResultSet::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any BaseResultSet::queryInterface( const Type & rType ) { Any aRet = BaseResultSet_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); @@ -173,7 +173,7 @@ Any BaseResultSet::queryInterface( const Type & rType ) throw (RuntimeException, // } // } -Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > BaseResultSet::getTypes() { static Sequence< Type > *pCollection; if( ! pCollection ) @@ -191,7 +191,7 @@ Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exceptio return *pCollection; } -Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> BaseResultSet::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -203,7 +203,7 @@ Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException // return new ResultSetMetaData( m_refMutex, this, &m_result ); // } -sal_Bool BaseResultSet::next( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::next( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -211,49 +211,49 @@ sal_Bool BaseResultSet::next( ) throw (SQLException, RuntimeException, std::exc return m_row < m_rowCount; } -sal_Bool BaseResultSet::isBeforeFirst( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isBeforeFirst( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row == -1; } -sal_Bool BaseResultSet::isAfterLast( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isAfterLast( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row >= m_rowCount; } -sal_Bool BaseResultSet::isFirst( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isFirst( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row == 0 && m_rowCount; } -sal_Bool BaseResultSet::isLast( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::isLast( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row >= 0 && m_row + 1 == m_rowCount; } -void BaseResultSet::beforeFirst( ) throw (SQLException, RuntimeException, std::exception) +void BaseResultSet::beforeFirst( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); m_row = -1; } -void BaseResultSet::afterLast( ) throw (SQLException, RuntimeException, std::exception) +void BaseResultSet::afterLast( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); m_row = m_rowCount; } -sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::first( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -263,7 +263,7 @@ sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException, std::ex return bRet; } -sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::last( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -273,14 +273,14 @@ sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException, std::exc return bRet; } -sal_Int32 BaseResultSet::getRow( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 BaseResultSet::getRow( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row +1; } -sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::absolute( sal_Int32 row ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -299,7 +299,7 @@ sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeEx return true; } -sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::relative( sal_Int32 rows ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -312,7 +312,7 @@ sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeE return true; } -sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::previous( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -322,27 +322,27 @@ sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException, std: return bRet; } -void BaseResultSet::refreshRow( ) throw (SQLException, RuntimeException, std::exception) +void BaseResultSet::refreshRow( ) { // TODO: not supported for now } -sal_Bool BaseResultSet::rowUpdated( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::rowUpdated( ) { return false; } -sal_Bool BaseResultSet::rowInserted( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::rowInserted( ) { return false; } -sal_Bool BaseResultSet::rowDeleted( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::rowDeleted( ) { return false; } -Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, RuntimeException, std::exception) +Reference< XInterface > BaseResultSet::getStatement() { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -352,7 +352,7 @@ Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, Runti //----------------- XRow interface ---------------------------------------------------- -sal_Bool BaseResultSet::wasNull( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::wasNull( ) { return m_wasNull; } @@ -371,7 +371,7 @@ Any BaseResultSet::convertTo( const Any & val , const Type & type ) return aRet; } -sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) +sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -397,7 +397,6 @@ sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, } sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -409,7 +408,6 @@ sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex ) } sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -420,7 +418,7 @@ sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex ) return i; } -OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) +OUString BaseResultSet::getString( sal_Int32 columnIndex ) { MutexGuard guard(m_refMutex->mutex); checkClosed(); @@ -433,7 +431,6 @@ OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, } sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -445,7 +442,6 @@ sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex ) } sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -457,7 +453,6 @@ sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex ) } float BaseResultSet::getFloat( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -469,7 +464,6 @@ float BaseResultSet::getFloat( sal_Int32 columnIndex ) } double BaseResultSet::getDouble( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -480,7 +474,6 @@ double BaseResultSet::getDouble( sal_Int32 columnIndex ) } Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -507,32 +500,27 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) css::util::Date BaseResultSet::getDate( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDate( getString( columnIndex ) ); } css::util::Time BaseResultSet::getTime( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toTime( getString( columnIndex ) ); } css::util::DateTime BaseResultSet::getTimestamp( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDateTime( getString( columnIndex ) ); } // LEM TODO: these look like they are missing an actual implementation Reference< css::io::XInputStream > BaseResultSet::getBinaryStream( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return nullptr; } Reference< css::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return nullptr; } @@ -540,31 +528,26 @@ Reference< css::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 Any BaseResultSet::getObject( sal_Int32 /* columnIndex */, const Reference< css::container::XNameAccess >& /* typeMap */ ) - throw (SQLException, RuntimeException, std::exception) { return Any(); } Reference< css::sdbc::XRef > BaseResultSet::getRef( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return Reference< css::sdbc::XRef > (); } Reference< css::sdbc::XBlob > BaseResultSet::getBlob( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return Reference< css::sdbc::XBlob > (); } Reference< css::sdbc::XClob > BaseResultSet::getClob( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException, std::exception) { return Reference< css::sdbc::XClob > (); } Reference< css::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException, std::exception) { return new Array( m_refMutex, parseArray( getString( columnIndex ) ), *this, m_tc ); } @@ -576,7 +559,6 @@ Reference< css::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex ) sal_Bool BaseResultSet::convertFastPropertyValue( Any & /* rConvertedValue */, Any & /* rOldValue */, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { bool bRet; switch( nHandle ) @@ -620,7 +602,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue( void BaseResultSet::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) + sal_Int32 nHandle,const Any& rValue ) { m_props[nHandle] = rValue; } @@ -631,7 +613,6 @@ void BaseResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } Reference < XPropertySetInfo > BaseResultSet::getPropertySetInfo() - throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getResultSetPropertyArrayHelper() ); } @@ -641,7 +622,7 @@ void BaseResultSet::disposing() close(); } -void BaseResultSet::checkColumnIndex(sal_Int32 index ) throw ( SQLException, RuntimeException ) +void BaseResultSet::checkColumnIndex(sal_Int32 index ) { if( index < 1 || index > m_fieldCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index caf3218b548f..2ac107c1925a 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -84,12 +84,10 @@ protected: @throws css::sdbc::SQLException @throws css::uno::RuntimeException */ - virtual void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) = 0; + virtual void checkClosed() = 0; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex( sal_Int32 index ) - throw ( css::sdbc::SQLException, css::uno::RuntimeException ); + void checkColumnIndex( sal_Int32 index ); void checkRowIndex(); virtual css::uno::Any getValue( sal_Int32 columnIndex ) = 0; @@ -109,18 +107,15 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { BaseResultSet_BASE::acquire(); } virtual void SAL_CALL release() throw() override { BaseResultSet_BASE::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XCloseable // virtual void SAL_CALL close( ) // throw (css::sdbc::SQLException, css::uno::RuntimeException) = 0; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XResultSetMetaDataSupplier // virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) @@ -128,87 +123,49 @@ public: // XResultSetMetaDataSupplier public: // XResultSet // Methods - virtual sal_Bool SAL_CALL next( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() override; public: // XRow - virtual sal_Bool SAL_CALL wasNull( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; public: // XColumnLocate // virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) @@ -221,13 +178,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -236,8 +191,7 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 0ae43eee2808..563345047368 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -105,7 +105,7 @@ public: { } - virtual void SAL_CALL dispose() throw (std::exception) override + virtual void SAL_CALL dispose() override { if( m_conn.is() ) { @@ -199,7 +199,7 @@ typedef ::std::list< css::uno::Reference< css::sdbc::XCloseable > > CloseableLis typedef ::std::list< css::uno::Reference< css::lang::XComponent > > DisposeableList; -void Connection::close() throw ( SQLException, RuntimeException, std::exception ) +void Connection::close() { CloseableList lst; DisposeableList lstDispose; @@ -253,7 +253,7 @@ void Connection::removeFromWeakMap( const ::rtl::ByteSequence & id ) m_myStatements.erase( ii ); } -Reference< XStatement > Connection::createStatement() throw (SQLException, RuntimeException, std::exception) +Reference< XStatement > Connection::createStatement() { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -268,7 +268,6 @@ Reference< XStatement > Connection::createStatement() throw (SQLException, Runti } Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -285,7 +284,6 @@ Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sq } Reference< XPreparedStatement > Connection::prepareCall( const OUString& ) - throw (SQLException, RuntimeException, std::exception) { throw SQLException( "pq_driver: Callable statements not supported", @@ -294,39 +292,37 @@ Reference< XPreparedStatement > Connection::prepareCall( const OUString& ) OUString Connection::nativeSQL( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { return sql; } -void Connection::setAutoCommit( sal_Bool ) throw (SQLException, RuntimeException, std::exception) +void Connection::setAutoCommit( sal_Bool ) { // UNSUPPORTED } -sal_Bool Connection::getAutoCommit() throw (SQLException, RuntimeException, std::exception) +sal_Bool Connection::getAutoCommit() { // UNSUPPORTED return true; } -void Connection::commit() throw (SQLException, RuntimeException, std::exception) +void Connection::commit() { // UNSUPPORTED } -void Connection::rollback() throw (SQLException, RuntimeException, std::exception) +void Connection::rollback() { // UNSUPPORTED } -sal_Bool Connection::isClosed() throw (SQLException, RuntimeException, std::exception) +sal_Bool Connection::isClosed() { return m_settings.pConnection == nullptr; } Reference< XDatabaseMetaData > Connection::getMetaData() - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -335,25 +331,24 @@ Reference< XDatabaseMetaData > Connection::getMetaData() return m_meta; } -void Connection::setReadOnly( sal_Bool ) throw (SQLException, RuntimeException, std::exception) +void Connection::setReadOnly( sal_Bool ) { // UNSUPPORTED } -sal_Bool Connection::isReadOnly() throw (SQLException, RuntimeException, std::exception) +sal_Bool Connection::isReadOnly() { // UNSUPPORTED return false; } void Connection::setCatalog( const OUString& ) - throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::exception) +OUString Connection::getCatalog() { MutexGuard guard( m_refMutex->mutex ); if( m_settings.pConnection == nullptr ) @@ -366,18 +361,17 @@ OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::ex } void Connection::setTransactionIsolation( sal_Int32 ) - throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -sal_Int32 Connection::getTransactionIsolation() throw (SQLException, RuntimeException, std::exception) +sal_Int32 Connection::getTransactionIsolation() { // UNSUPPORTED return 0; } -Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeException, std::exception) +Reference< XNameAccess > Connection::getTypeMap() { Reference< XNameAccess > t; { @@ -388,17 +382,16 @@ Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeEx } void Connection::setTypeMap( const Reference< XNameAccess >& typeMap ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); m_typeMap = typeMap; } -Any Connection::getWarnings() throw (SQLException, RuntimeException, std::exception) +Any Connection::getWarnings() { return Any(); } -void Connection::clearWarnings() throw (SQLException, RuntimeException, std::exception) +void Connection::clearWarnings() { } @@ -484,7 +477,6 @@ static void properties2arrays( const Sequence< PropertyValue > & args, } void Connection::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { OUString url; Sequence< PropertyValue > args; @@ -604,7 +596,7 @@ void Connection::disposing() close(); } -void Connection::checkClosed() throw ( SQLException, RuntimeException ) +void Connection::checkClosed() { if( !m_settings.pConnection ) throw SQLException( "pq_connection: Connection already closed", @@ -612,7 +604,6 @@ void Connection::checkClosed() throw ( SQLException, RuntimeException ) } Reference< XNameAccess > Connection::getTables() - throw (css::uno::RuntimeException, std::exception) { if (isLog(&m_settings, LogLevel::Info)) { @@ -628,7 +619,6 @@ Reference< XNameAccess > Connection::getTables() } Reference< XNameAccess > Connection::getViews() - throw (css::uno::RuntimeException, std::exception) { if (isLog(&m_settings, LogLevel::Info)) { @@ -645,7 +635,6 @@ Reference< XNameAccess > Connection::getViews() Reference< XNameAccess > Connection::getUsers() - throw (css::uno::RuntimeException, std::exception) { if (isLog(&m_settings, LogLevel::Info)) { @@ -660,7 +649,7 @@ Reference< XNameAccess > Connection::getUsers() /// @throws Exception Reference< XInterface > ConnectionCreateInstance( - const Reference< XComponentContext > & ctx ) throw (Exception, std::exception) + const Reference< XComponentContext > & ctx ) { ::rtl::Reference< RefCountedMutex > ref = new RefCountedMutex(); return * new Connection( ref, ctx ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index fe5cc2a31996..85f2a7e50f24 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -167,8 +167,7 @@ class Connection : public ConnectionBase private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ); + void checkClosed(); public: Connection( @@ -178,70 +177,48 @@ public: virtual ~Connection( ) override; public: // XCloseable - virtual void SAL_CALL close() - throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL close() override; public: // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override ; virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( - const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( - const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; virtual void SAL_CALL setTypeMap( - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; public: // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; public: // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; public: // XTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; public: // XUsersSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) override; public: // XViewsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) override; public: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index a99992655139..db26ab3abb9f 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -130,36 +130,36 @@ DatabaseMetaData::DatabaseMetaData( init_getPrivs_stmt(); } -sal_Bool DatabaseMetaData::allProceduresAreCallable( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::allProceduresAreCallable( ) { // TODO return false; } -sal_Bool DatabaseMetaData::allTablesAreSelectable( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::allTablesAreSelectable( ) { return true; } -OUString DatabaseMetaData::getURL( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getURL( ) { // TODO // LEM TODO: implement return OUString(); } -OUString DatabaseMetaData::getUserName( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getUserName( ) { return m_pSettings->user; } -sal_Bool DatabaseMetaData::isReadOnly( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::isReadOnly( ) { return false; } -sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) { // Whether NULL values are considered, for sorting purposes, LARGER than any other value. // Specification: http://download.oracle.com/javase/6/docs/api/java/sql/DatabaseMetaData.html#nullsAreSortedHigh() @@ -167,51 +167,51 @@ sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) throw (SQLException, RuntimeEx return true; } -sal_Bool DatabaseMetaData::nullsAreSortedLow( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedLow( ) { return ! nullsAreSortedHigh(); } -sal_Bool DatabaseMetaData::nullsAreSortedAtStart( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool DatabaseMetaData::nullsAreSortedAtEnd( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -OUString DatabaseMetaData::getDatabaseProductName( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDatabaseProductName( ) { return OUString("PostgreSQL"); } -OUString DatabaseMetaData::getDatabaseProductVersion( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDatabaseProductVersion( ) { return OUString::createFromAscii( PQparameterStatus( m_pSettings->pConnection, "server_version" ) ); } -OUString DatabaseMetaData::getDriverName( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDriverName( ) { return OUString("postgresql-sdbc"); } -OUString DatabaseMetaData::getDriverVersion( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getDriverVersion( ) { return OUString(PQ_SDBC_DRIVER_VERSION); } -sal_Int32 DatabaseMetaData::getDriverMajorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getDriverMajorVersion( ) { return PQ_SDBC_MAJOR; } -sal_Int32 DatabaseMetaData::getDriverMinorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getDriverMinorVersion( ) { return PQ_SDBC_MINOR; } -sal_Bool DatabaseMetaData::usesLocalFiles( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::usesLocalFiles( ) { // LEM TODO: // http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/XDatabaseMetaData_Interface @@ -222,62 +222,62 @@ sal_Bool DatabaseMetaData::usesLocalFiles( ) throw (SQLException, RuntimeExcept return false; } -sal_Bool DatabaseMetaData::usesLocalFilePerTable( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers( ) { return true; } -sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return true; } -sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) { return false; } -OUString DatabaseMetaData::getIdentifierQuoteString( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getIdentifierQuoteString( ) { return OUString("\""); } -OUString DatabaseMetaData::getSQLKeywords( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSQLKeywords( ) { // In Java 6, this is all keywords that are not SQL:2003 // In Java 2 v1.4 and as per LibreOffice SDK doc, this is all keywords that are not SQL92 @@ -312,7 +312,7 @@ OUString DatabaseMetaData::getSQLKeywords( ) throw (SQLException, RuntimeExcept "WINDOW" //SQL:2003 ); } -OUString DatabaseMetaData::getNumericFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getNumericFunctions( ) { // See http://www.postgresql.org/docs/9.1/static/functions-math.html // LEM TODO: Err... http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/Support_Scalar_Functions @@ -353,7 +353,7 @@ OUString DatabaseMetaData::getNumericFunctions( ) throw (SQLException, RuntimeE ); } -OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getStringFunctions( ) { // See http://www.postgresql.org/docs/9.1/static/functions-string.html return OUString( @@ -407,7 +407,7 @@ OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeEx ); } -OUString DatabaseMetaData::getSystemFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSystemFunctions( ) { // See http://www.postgresql.org/docs/9.1/static/functions-info.html // and http://www.postgresql.org/docs/9.1/static/functions-admin.html @@ -536,7 +536,7 @@ OUString DatabaseMetaData::getSystemFunctions( ) throw (SQLException, RuntimeEx "pg_sleep" ); } -OUString DatabaseMetaData::getTimeDateFunctions( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getTimeDateFunctions( ) { // TODO return OUString( @@ -565,112 +565,112 @@ OUString DatabaseMetaData::getTimeDateFunctions( ) throw (SQLException, Runtime "transaction_timestamp," ); } -OUString DatabaseMetaData::getSearchStringEscape( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSearchStringEscape( ) { return OUString("\\"); } -OUString DatabaseMetaData::getExtraNameCharacters( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getExtraNameCharacters( ) { return OUString("$"); } -sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn( ) { return true; } -sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn( ) { return true; } -sal_Bool DatabaseMetaData::supportsColumnAliasing( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsColumnAliasing( ) { return true; } -sal_Bool DatabaseMetaData::nullPlusNonNullIsNull( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::nullPlusNonNullIsNull( ) { return true; } -sal_Bool DatabaseMetaData::supportsTypeConversion( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTypeConversion( ) { // LEM: this is specifically whether the "CONVERT" function is supported // It seems that in PostgreSQL, that function is only for string encoding, so no. return false; } -sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) { (void) fromType; (void) toType; return false; } -sal_Bool DatabaseMetaData::supportsTableCorrelationNames( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTableCorrelationNames( ) { // LEM: A correlation name is "bar" in "SELECT foo FROM qux [AS] bar WHERE ..." return true; } -sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } -sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy( ) { return true; } -sal_Bool DatabaseMetaData::supportsOrderByUnrelated( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOrderByUnrelated( ) { return true; } -sal_Bool DatabaseMetaData::supportsGroupBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsGroupBy( ) { return true; } -sal_Bool DatabaseMetaData::supportsGroupByUnrelated( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsGroupByUnrelated( ) { return true; } -sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect( ) { return true; } -sal_Bool DatabaseMetaData::supportsLikeEscapeClause( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsLikeEscapeClause( ) { return true; } -sal_Bool DatabaseMetaData::supportsMultipleResultSets( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMultipleResultSets( ) { return true; } -sal_Bool DatabaseMetaData::supportsMultipleTransactions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMultipleTransactions( ) { // Allows multiple transactions open at once (on different connections!) return true; } -sal_Bool DatabaseMetaData::supportsNonNullableColumns( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsNonNullableColumns( ) { return true; } -sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) { // LEM: jdbc driver says not, although the comments in it seem old // fdo#45249 Base query design won't use any aggregate function @@ -681,123 +681,123 @@ sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) throw (SQLException, Runti return true; } -sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; } -sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsANSI92FullSQL( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsANSI92FullSQL( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility( ) { // LEM: jdbc driver says yes, although comment says they are not sure what this means... return true; } -sal_Bool DatabaseMetaData::supportsOuterJoins( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOuterJoins( ) { return true; } -sal_Bool DatabaseMetaData::supportsFullOuterJoins( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsFullOuterJoins( ) { return true; } -sal_Bool DatabaseMetaData::supportsLimitedOuterJoins( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsLimitedOuterJoins( ) { return true; } -OUString DatabaseMetaData::getSchemaTerm( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getSchemaTerm( ) { return OUString("SCHEMA"); } -OUString DatabaseMetaData::getProcedureTerm( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getProcedureTerm( ) { return OUString("function"); } -OUString DatabaseMetaData::getCatalogTerm( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getCatalogTerm( ) { return OUString("DATABASE"); } -sal_Bool DatabaseMetaData::isCatalogAtStart( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::isCatalogAtStart( ) { return true; } -OUString DatabaseMetaData::getCatalogSeparator( ) throw (SQLException, RuntimeException, std::exception) +OUString DatabaseMetaData::getCatalogSeparator( ) { return OUString("."); } -sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return true; } -sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return true; } -sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } -sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } @@ -807,98 +807,97 @@ sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw (SQL // to be supported; see {UPDATE,DELETE} /table/ (...) WHERE CURRENT OF /cursor_name/" syntax // and http://www.postgresql.org/docs/9.1/static/view-pg-cursors.html // http://www.postgresql.org/docs/9.1/static/libpq-example.html actually uses a cursor :) -sal_Bool DatabaseMetaData::supportsPositionedDelete( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsPositionedDelete( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsPositionedUpdate( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsPositionedUpdate( ) { // LEM: jdbc driver says not, although the comments in it seem old return false; } -sal_Bool DatabaseMetaData::supportsSelectForUpdate( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSelectForUpdate( ) { return true; } -sal_Bool DatabaseMetaData::supportsStoredProcedures( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsStoredProcedures( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInExists( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInExists( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInIns( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInIns( ) { return true; } -sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds( ) { // LEM: jdbc driver says yes, although comment says they don't know what this means... return true; } -sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries( ) { return true; } -sal_Bool DatabaseMetaData::supportsUnion( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsUnion( ) { return true; } -sal_Bool DatabaseMetaData::supportsUnionAll( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsUnionAll( ) { return true; } -sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return true; } -sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return true; } -sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxCharLiteralLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxCharLiteralLength( ) { return 0; } // Copied / adapted / simplified from JDBC driver sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { MutexGuard guard( m_refMutex->mutex ); @@ -913,7 +912,6 @@ sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName) } sal_Int32 DatabaseMetaData::getMaxNameLength() - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if ( m_pSettings->maxNameLen == 0) m_pSettings->maxNameLen = getIntSetting( "max_identifier_length" ); @@ -922,7 +920,6 @@ sal_Int32 DatabaseMetaData::getMaxNameLength() } sal_Int32 DatabaseMetaData::getMaxIndexKeys() - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if ( m_pSettings->maxIndexKeys == 0) m_pSettings->maxIndexKeys = getIntSetting("max_index_keys"); @@ -930,69 +927,69 @@ sal_Int32 DatabaseMetaData::getMaxIndexKeys() return m_pSettings->maxIndexKeys; } -sal_Int32 DatabaseMetaData::getMaxColumnNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInIndex( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInIndex( ) { return getMaxIndexKeys(); } -sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInSelect( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInSelect( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInTable( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxColumnsInTable( ) { return 1600; } -sal_Int32 DatabaseMetaData::getMaxConnections( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxConnections( ) { // LEM: The JDBC driver returns an arbitrary 8192; truth is as much as OS / hardware supports return 0; } -sal_Int32 DatabaseMetaData::getMaxCursorNameLength( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxCursorNameLength( ) //TODO, don't know { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxIndexLength( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxIndexLength( ) //TODO, don't know { // LEM: that's the index itself, not its name return 0; } -sal_Int32 DatabaseMetaData::getMaxSchemaNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxSchemaNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxProcedureNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxProcedureNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxCatalogNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxCatalogNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxRowSize( ) { // jdbc driver says 1GB, but http://www.postgresql.org/about/ says 1.6TB // and that 1GB is the maximum _field_ size @@ -1000,14 +997,14 @@ sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeExcept return 0; } -sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { // LEM: Err... PostgreSQL basically does not do BLOBs well // In any case, BLOBs do not change the maximal row length AFAIK return true; } -sal_Int32 DatabaseMetaData::getMaxStatementLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxStatementLength( ) { // LEM: actually, that would be 2^sizeof(size_t)-1 // on the server? on the client (because of libpq)? minimum of the two? not sure @@ -1015,37 +1012,37 @@ sal_Int32 DatabaseMetaData::getMaxStatementLength( ) throw (SQLException, Runti return 0; } -sal_Int32 DatabaseMetaData::getMaxStatements( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxStatements( ) //TODO, don't know { return 0; } -sal_Int32 DatabaseMetaData::getMaxTableNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxTableNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxTablesInSelect( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxTablesInSelect( ) { return 0; } -sal_Int32 DatabaseMetaData::getMaxUserNameLength( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getMaxUserNameLength( ) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation( ) throw (SQLException, RuntimeException, std::exception) +sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation( ) { return css::sdbc::TransactionIsolation::READ_COMMITTED; } -sal_Bool DatabaseMetaData::supportsTransactions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTransactions( ) { return true; } -sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { if ( level == css::sdbc::TransactionIsolation::READ_COMMITTED || level == css::sdbc::TransactionIsolation::SERIALIZABLE @@ -1057,22 +1054,21 @@ sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) } sal_Bool DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) - throw (SQLException, RuntimeException, std::exception) { return true; } -sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return false; } -sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return false; } -sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return false; } @@ -1080,7 +1076,7 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc css::uno::Reference< XResultSet > DatabaseMetaData::getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern ) { (void) catalog; (void) schemaPattern; (void) procedureNamePattern; // 1. PROCEDURE_CAT string => procedure catalog (may be NULL ) @@ -1106,7 +1102,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { (void) catalog; (void) schemaPattern; (void) procedureNamePattern; (void) columnNamePattern; MutexGuard guard( m_refMutex->mutex ); @@ -1121,7 +1117,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getTables( const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) - throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) types; Statics &statics = getStatics(); @@ -1256,7 +1251,6 @@ namespace } css::uno::Reference< XResultSet > DatabaseMetaData::getSchemas( ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -1291,7 +1285,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getSchemas( ) } css::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs( ) - throw (SQLException, RuntimeException, std::exception) { // LEM TODO: return the current catalog like JDBC driver? // at least fake the columns, even if no content @@ -1301,7 +1294,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs( ) } css::uno::Reference< XResultSet > DatabaseMetaData::getTableTypes( ) - throw (SQLException, RuntimeException, std::exception) { // LEM TODO: this can be made dynamic, see JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -1457,7 +1449,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { (void) catalog; // LEM TODO: review in comparison with JDBC driver @@ -1643,7 +1635,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { (void) catalog; @@ -1674,7 +1666,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges( css::uno::Reference< XResultSet > DatabaseMetaData::getTablePrivileges( const css::uno::Any&, const OUString& schemaPattern, - const OUString& tableNamePattern ) throw (SQLException, RuntimeException, std::exception) + const OUString& tableNamePattern ) { MutexGuard guard( m_refMutex->mutex ); @@ -1702,7 +1694,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier( const OUString&, const OUString&, sal_Int32, - sal_Bool ) throw (SQLException, RuntimeException, std::exception) + sal_Bool ) { //LEM TODO: implement! See JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -1713,7 +1705,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier( css::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns( const css::uno::Any&, const OUString&, - const OUString& ) throw (SQLException, RuntimeException, std::exception) + const OUString& ) { //LEM TODO: implement! See JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -1724,7 +1716,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns( css::uno::Reference< XResultSet > DatabaseMetaData::getPrimaryKeys( const css::uno::Any&, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException, std::exception) + const OUString& table ) { //LEM TODO: review MutexGuard guard( m_refMutex->mutex ); @@ -2075,7 +2067,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys( const OUString& primaryTable, const Any& /* foreignCatalog */, const OUString& foreignSchema, - const OUString& foreignTable ) throw (SQLException, RuntimeException) + const OUString& foreignTable ) { unsigned int i = 0; if ( ! primarySchema.isEmpty() ) @@ -2109,7 +2101,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys( css::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys( const css::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException, std::exception) + const OUString& table ) { return getImportedExportedKeys(Any(), OUString(), OUString(), catalog, schema, table); } @@ -2117,7 +2109,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys( css::uno::Reference< XResultSet > DatabaseMetaData::getExportedKeys( const css::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException, std::exception) + const OUString& table ) { return getImportedExportedKeys(catalog, schema, table, Any(), OUString(), OUString()); } @@ -2128,7 +2120,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getCrossReference( const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, - const OUString& foreignTable ) throw (SQLException, RuntimeException, std::exception) + const OUString& foreignTable ) { return getImportedExportedKeys( primaryCatalog, primarySchema, primaryTable, foreignCatalog, foreignSchema, foreignTable ); } @@ -2323,7 +2315,6 @@ namespace css::uno::Reference< XResultSet > DatabaseMetaData::getTypeInfo( ) - throw (SQLException, RuntimeException, std::exception) { // Note: Indexes start at 0 (in the API doc, they start at 1) MutexGuard guard( m_refMutex->mutex ); @@ -2378,7 +2369,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo( const OUString& schema, const OUString& table, sal_Bool unique, - sal_Bool ) throw (SQLException, RuntimeException, std::exception) + sal_Bool ) { //LEM TODO: review MutexGuard guard( m_refMutex->mutex ); @@ -2499,7 +2490,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo( } sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) - throw (SQLException, RuntimeException, std::exception) { if ( setType == css::sdbc::ResultSetType::SCROLL_SENSITIVE ) return false; @@ -2508,7 +2498,7 @@ sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) } sal_Bool DatabaseMetaData::supportsResultSetConcurrency( - sal_Int32 setType, sal_Int32 concurrency ) throw (SQLException, RuntimeException, std::exception) + sal_Int32 setType, sal_Int32 concurrency ) { (void) concurrency; if ( ! supportsResultSetType( setType ) ) @@ -2517,56 +2507,56 @@ sal_Bool DatabaseMetaData::supportsResultSetConcurrency( return true; } -sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ ) { return true; } -sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ ) { return true; } -sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ ) { return true; } -sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ ) { return false; } -sal_Bool DatabaseMetaData::supportsBatchUpdates( ) throw (SQLException, RuntimeException, std::exception) +sal_Bool DatabaseMetaData::supportsBatchUpdates( ) { return true; } -css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any&, const OUString&, const OUString&, const css::uno::Sequence< sal_Int32 >& ) throw (SQLException, RuntimeException, std::exception) +css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any&, const OUString&, const OUString&, const css::uno::Sequence< sal_Int32 >& ) { //LEM TODO: implement! See JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -2575,7 +2565,6 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any } css::uno::Reference< css::sdbc::XConnection > DatabaseMetaData::getConnection() - throw (SQLException, RuntimeException, std::exception) { return m_origin; } diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx index 7087f20387c4..2bb4ce1a0ddf 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx @@ -58,19 +58,18 @@ class DatabaseMetaData : /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - sal_Int32 getIntSetting(const OUString& settingName) throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getIntSetting(const OUString& settingName); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - sal_Int32 getMaxIndexKeys() throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getMaxIndexKeys(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - sal_Int32 getMaxNameLength() throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getMaxNameLength(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException css::uno::Reference< css::sdbc::XResultSet > getImportedExportedKeys( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, - const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) - throw (css::sdbc::SQLException, css::uno::RuntimeException); + const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ); void init_getReferences_stmt (); void init_getPrivs_stmt (); @@ -83,155 +82,155 @@ public: public: // Methods - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 5388f3409e50..21fa728448a0 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -81,7 +81,6 @@ Sequence< OUString > DriverGetSupportedServiceNames() Reference< XConnection > Driver::connect( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { if( ! acceptsURL( url ) ) // XDriver spec tells me to do so ... return Reference< XConnection > (); @@ -97,45 +96,40 @@ Reference< XConnection > Driver::connect( } sal_Bool Driver::acceptsURL( const OUString& url ) - throw (SQLException, RuntimeException, std::exception) { return url.startsWith( "sdbc:postgresql:" ); } Sequence< DriverPropertyInfo > Driver::getPropertyInfo( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { (void)url; (void)info; return Sequence< DriverPropertyInfo > (); } -sal_Int32 Driver::getMajorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 Driver::getMajorVersion( ) { return PQ_SDBC_MAJOR; } -sal_Int32 Driver::getMinorVersion( ) throw (RuntimeException, std::exception) +sal_Int32 Driver::getMinorVersion( ) { return PQ_SDBC_MINOR; } // XServiceInfo OUString SAL_CALL Driver::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return DriverGetImplementationName(); } sal_Bool Driver::supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > Driver::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return DriverGetSupportedServiceNames(); } @@ -149,14 +143,12 @@ void Driver::disposing() Reference< XTablesSupplier > Driver::getDataDefinitionByConnection( const Reference< XConnection >& connection ) - throw (SQLException, RuntimeException, std::exception) { return Reference< XTablesSupplier >( connection , UNO_QUERY ); } Reference< XTablesSupplier > Driver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException, std::exception) { return Reference< XTablesSupplier > ( connect( url, info ), UNO_QUERY ); } @@ -189,29 +181,24 @@ public: // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + Reference< XComponentContext > const & xContext ) override; virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, - Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException, std::exception) override; + Reference< XComponentContext > const & xContext ) override; // XServiceInfo - OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return m_implName; } - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override { for( int i = 0 ; i < m_serviceNames.getLength() ; i ++ ) if( m_serviceNames[i] == ServiceName ) return true; return false; } - Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override + Sequence< OUString > SAL_CALL getSupportedServiceNames() override { return m_serviceNames; } @@ -229,7 +216,6 @@ private: Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext( Sequence< Any > const &rArguments, const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception, std::exception ) { (void)rArguments; return createInstanceWithContext( ctx ); @@ -237,7 +223,6 @@ Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgument Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithContext( const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception, std::exception ) { if( ! m_theInstance.is() ) { diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index 9217b8825d27..91485855af39 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -82,40 +82,32 @@ public: public: // XDriver virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; public: // XServiceInfo // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; public: // XDataDefinitionSupplier virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( - const css::uno::Reference< css::sdbc::XConnection >& connection ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XConnection >& connection ) override; virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) override; // XComponent virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx index 5a91ad938cdc..b1c35a32c2b1 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx @@ -68,7 +68,6 @@ FakedUpdateableResultSet::FakedUpdateableResultSet( css::uno::Any FakedUpdateableResultSet::queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) { Any ret = ResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -81,7 +80,6 @@ css::uno::Any FakedUpdateableResultSet::queryInterface( css::uno::Sequence< css::uno::Type > FakedUpdateableResultSet::getTypes() - throw( css::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -101,123 +99,122 @@ css::uno::Sequence< css::uno::Type > FakedUpdateableResultSet::getTypes() } css::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementationId() - throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } -void FakedUpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::insertRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::deleteRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::cancelRowUpdates( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::moveToInsertRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::moveToCurrentRow( ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const css::uno::Sequence< sal_Int8 >& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const css::uno::Sequence< sal_Int8 >& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const css::util::Date& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const css::util::Date& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const css::util::Time& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const css::util::Time& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const css::util::DateTime& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const css::util::DateTime& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception) +void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx index 1830f4186678..74ed8c8415ee 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx @@ -68,41 +68,38 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ResultSet::acquire(); } virtual void SAL_CALL release() throw() override { ResultSet::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 27a931da2919..ee75cde78e12 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -223,7 +223,7 @@ void PreparedStatement::checkColumnIndex( sal_Int32 parameterIndex ) throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any () ); } } -void PreparedStatement::checkClosed() throw (SQLException, RuntimeException ) +void PreparedStatement::checkClosed() { if( ! m_pSettings || ! m_pSettings->pConnection ) throw SQLException( @@ -231,14 +231,14 @@ void PreparedStatement::checkClosed() throw (SQLException, RuntimeException ) *this, OUString(),1,Any()); } -Any PreparedStatement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any PreparedStatement::queryInterface( const Type & rType ) { Any aRet = PreparedStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::exception ) +Sequence< Type > PreparedStatement::getTypes() { static Sequence< Type > *pCollection; if( ! pCollection ) @@ -256,12 +256,12 @@ Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::ex return *pCollection; } -Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeException, std::exception ) +Sequence< sal_Int8> PreparedStatement::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::exception) +void PreparedStatement::close( ) { // let the connection die without acquired mutex ! Reference< XConnection > r; @@ -282,7 +282,6 @@ void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::ex } void PreparedStatement::raiseSQLException( const char * errorMsg ) - throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); @@ -297,7 +296,6 @@ void PreparedStatement::raiseSQLException( const char * errorMsg ) } Reference< XResultSet > PreparedStatement::executeQuery( ) - throw (SQLException, RuntimeException, std::exception) { Reference< XCloseable > lastResultSet = m_lastResultset; if( lastResultSet.is() ) @@ -311,7 +309,6 @@ Reference< XResultSet > PreparedStatement::executeQuery( ) } sal_Int32 PreparedStatement::executeUpdate( ) - throw (SQLException, RuntimeException, std::exception) { if( execute( ) ) { @@ -321,7 +318,6 @@ sal_Int32 PreparedStatement::executeUpdate( ) } sal_Bool PreparedStatement::execute( ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -400,7 +396,6 @@ sal_Bool PreparedStatement::execute( ) } Reference< XConnection > PreparedStatement::getConnection( ) - throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > ret; { @@ -413,7 +408,6 @@ Reference< XConnection > PreparedStatement::getConnection( ) void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) - throw (SQLException, RuntimeException, std::exception) { (void)sqlType; MutexGuard guard( m_refMutex->mutex ); @@ -424,7 +418,6 @@ void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) void PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) - throw (SQLException, RuntimeException, std::exception) { (void) sqlType; (void) typeName; MutexGuard guard( m_refMutex->mutex ); @@ -435,7 +428,6 @@ void PreparedStatement::setObjectNull( void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -447,19 +439,16 @@ void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) } void PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) - throw (SQLException, RuntimeException, std::exception) { setInt(parameterIndex,x); } void PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) - throw (SQLException, RuntimeException, std::exception) { setInt(parameterIndex, x ); } void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) - throw (SQLException, RuntimeException, std::exception) { // printf( "setString %d %d\n ", parameterIndex, x); MutexGuard guard(m_refMutex->mutex ); @@ -473,7 +462,6 @@ void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) } void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -486,7 +474,6 @@ void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) } void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -499,7 +486,6 @@ void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) } void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -512,7 +498,6 @@ void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) } void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) - throw (SQLException, RuntimeException, std::exception) { // printf( "setString %d %s\n ", parameterIndex, // OUStringToOString( x , RTL_TEXTENCODING_ASCII_US ).getStr()); @@ -531,7 +516,6 @@ void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) void PreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -555,20 +539,17 @@ void PreparedStatement::setBytes( void PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateString( x ) ); } void PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toTimeString( x ) ); } void PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateTimeString( x ) ); } @@ -577,7 +558,6 @@ void PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; (void) length; throw SQLException( @@ -589,7 +569,6 @@ void PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; (void) length; throw SQLException( @@ -598,7 +577,6 @@ void PreparedStatement::setCharacterStream( } void PreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) - throw (SQLException, RuntimeException, std::exception) { if( ! implSetObject( this, parameterIndex, x )) { @@ -614,7 +592,6 @@ void PreparedStatement::setObjectWithInfo( const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) - throw (SQLException, RuntimeException, std::exception) { (void) scale; if( css::sdbc::DataType::DECIMAL == targetSqlType || @@ -654,7 +631,6 @@ void PreparedStatement::setObjectWithInfo( void PreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -665,7 +641,6 @@ void PreparedStatement::setRef( void PreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -676,7 +651,6 @@ void PreparedStatement::setBlob( void PreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) - throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -687,31 +661,26 @@ void PreparedStatement::setClob( void PreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) - throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, array2String( x->getArray( nullptr ) ) ); } void PreparedStatement::clearParameters( ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); m_vars = OStringVector ( m_vars.size() ); } Any PreparedStatement::getWarnings( ) - throw (SQLException,RuntimeException, std::exception) { return Any(); } void PreparedStatement::clearWarnings( ) - throw (SQLException, RuntimeException, std::exception) { } Reference< css::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() - throw (SQLException,RuntimeException, std::exception) { Reference< css::sdbc::XResultSetMetaData > ret; Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); @@ -728,7 +697,6 @@ Reference< css::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() sal_Bool PreparedStatement::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { bool bRet; rOldValue = m_props[nHandle]; @@ -775,7 +743,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue( void PreparedStatement::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) + sal_Int32 nHandle,const Any& rValue ) { m_props[nHandle] = rValue; } @@ -786,7 +754,6 @@ void PreparedStatement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c } Reference < XPropertySetInfo > PreparedStatement::getPropertySetInfo() - throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getPreparedStatementPropertyArrayHelper() ); } @@ -798,23 +765,19 @@ void PreparedStatement::disposing() Reference< XResultSet > PreparedStatement::getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 PreparedStatement::getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool PreparedStatement::getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return false; } Reference< XResultSet > PreparedStatement::getGeneratedValues( ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); return getGeneratedValuesFromLastInsert( diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx index c3fc3c8d0be2..91e94bb85724 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx @@ -105,102 +105,69 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { PreparedStatement_BASE::acquire(); } virtual void SAL_CALL release() throw() override { PreparedStatement_BASE::release(); } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; public: // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; virtual void SAL_CALL setObjectNull( - sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; virtual void SAL_CALL setBytes( - sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; virtual void SAL_CALL setTimestamp( - sal_Int32 parameterIndex, const css::util::DateTime& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 parameterIndex, const css::util::DateTime& x ) override; virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, - sal_Int32 length ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 length ) override; virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, - sal_Int32 length ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, - sal_Int32 scale ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + sal_Int32 scale ) override; virtual void SAL_CALL setRef( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XRef >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XRef >& x ) override; virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XBlob >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XBlob >& x ) override; virtual void SAL_CALL setClob( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XClob >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XClob >& x ) override; virtual void SAL_CALL setArray( sal_Int32 parameterIndex, - const css::uno::Reference< css::sdbc::XArray >& x ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; public: // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -209,13 +176,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -224,26 +189,20 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // XGeneratedResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - getGeneratedValues( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + getGeneratedValues( ) override; public: // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; public: // XResultSetMetaDataSupplier (is required by framework (see // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() ) - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; public: // OComponentHelper virtual void SAL_CALL disposing() override; @@ -252,10 +211,9 @@ private: void checkColumnIndex( sal_Int32 parameterIndex ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkClosed(); /// @throws css::sdbc::SQLException - void raiseSQLException( const char * errorMsg ) - throw ( css::sdbc::SQLException ); + void raiseSQLException( const char * errorMsg ); // PGresult *pgExecute( OString *pQuery ); }; diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index e569b88da9c7..dafe25bd04f7 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -61,7 +61,6 @@ namespace pq_sdbc_driver { void ResultSet::checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) { if( ! m_result ) { @@ -130,7 +129,7 @@ Any ResultSet::getValue( sal_Int32 columnIndex ) ResultSet::~ResultSet() {} -void ResultSet::close( ) throw (SQLException, RuntimeException, std::exception) +void ResultSet::close( ) { Reference< XInterface > owner; { @@ -146,7 +145,7 @@ void ResultSet::close( ) throw (SQLException, RuntimeException, std::exception) } } -Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > ResultSet::getMetaData( ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -155,7 +154,6 @@ Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, } sal_Int32 ResultSet::findColumn( const OUString& columnName ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx index 5ccf50ed0902..40e4df23e547 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx @@ -61,8 +61,7 @@ protected: protected: /** mutex should be locked before called */ - virtual void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override; + virtual void checkClosed() override; /** unchecked, acquire mutex before calling */ @@ -79,16 +78,13 @@ public: virtual ~ResultSet() override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; public: // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; public: sal_Int32 guessDataType( sal_Int32 column ); diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index 2a256a70fe14..a121354f753f 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -281,13 +281,11 @@ Reference< css::beans::XPropertySet > ResultSetMetaData::getColumnByIndex( int i // Methods sal_Int32 ResultSetMetaData::getColumnCount( ) - throw (SQLException, RuntimeException, std::exception) { return m_colCount; } sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { bool ret = getBoolColumnProperty( getStatics().IS_AUTO_INCREMENT, column, false ); @@ -295,39 +293,35 @@ sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) } sal_Bool ResultSetMetaData::isCaseSensitive( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return true; // ??? hmm, numeric types or } -sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) { (void) column; return true; // mmm, what types are not searchable ? } -sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) { return getBoolColumnProperty( getStatics().IS_CURRENCY, column, false ); } sal_Int32 ResultSetMetaData::isNullable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return getIntColumnProperty( getStatics().IS_NULLABLE, column, css::sdbc::ColumnValue::NULLABLE_UNKNOWN ); } sal_Bool ResultSetMetaData::isSigned( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return true; } sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -335,12 +329,11 @@ sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) } OUString ResultSetMetaData::getColumnLabel( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return getColumnName( column); } -OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString ResultSetMetaData::getColumnName( sal_Int32 column ) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -348,14 +341,13 @@ OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLExceptio return m_colDesc[column-1].name; } -OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) { (void) column; return m_schemaName; } sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -363,7 +355,6 @@ sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column ) } sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkColumnIndex( column ); @@ -371,20 +362,17 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) } OUString ResultSetMetaData::getTableName( sal_Int32 ) - throw (SQLException, RuntimeException, std::exception) { // LEM TODO This is very fishy.. Should probably return the table to which that column belongs! return m_tableName; } OUString ResultSetMetaData::getCatalogName( sal_Int32 ) - throw (SQLException, RuntimeException, std::exception) { // can do this through XConnection.getCatalog() ! return OUString(); } sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { int ret = getIntColumnProperty( getStatics().TYPE, column, -100 ); if( -100 == ret ) @@ -398,7 +386,6 @@ sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) } OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { OUString ret; // give defensive answers, when data is not available try @@ -425,32 +412,27 @@ OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) sal_Bool ResultSetMetaData::isReadOnly( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return false; } sal_Bool ResultSetMetaData::isWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return ! isReadOnly( column ); // what's the sense if this method ? } sal_Bool ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return isWritable(column); // uhh, now it becomes really esoteric .... } OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { (void) column; return OUString(); } void ResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_colCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx index 077368751992..70ba16e5d3b6 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx @@ -80,8 +80,7 @@ class ResultSetMetaData : /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkColumnIndex( sal_Int32 columnIndex ); void checkTable(); void checkForTypes(); css::uno::Reference< css::beans::XPropertySet > getColumnByIndex( int index ); @@ -101,27 +100,27 @@ public: public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index 7f3556d8c003..0a0b06bb4e88 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -49,8 +49,6 @@ namespace pq_sdbc_driver { void SequenceResultSet::checkClosed() - throw ( css::sdbc::SQLException, - css::uno::RuntimeException ) { // we never close :o) } @@ -85,13 +83,11 @@ SequenceResultSet::~SequenceResultSet() } void SequenceResultSet::close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { // a noop } Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { if( ! m_meta.is() ) { @@ -109,7 +105,6 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) sal_Int32 SAL_CALL SequenceResultSet::findColumn( const OUString& columnName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { // no need to guard, as all members are readonly ! for( int i = 0 ;i < m_fieldCount ; i ++ ) diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx index 1f43cfa526d4..bf22e9de8d52 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx @@ -62,8 +62,7 @@ protected: protected: /** mutex should be locked before called */ - virtual void checkClosed() - throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override; + virtual void checkClosed() override; /** unchecked, acquire mutex before calling */ @@ -80,16 +79,13 @@ public: virtual ~SequenceResultSet() override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; public: // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index 9b4ed4d8a9de..bde1ac37ec92 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -58,69 +58,62 @@ SequenceResultSetMetaData::SequenceResultSetMetaData( // Methods sal_Int32 SequenceResultSetMetaData::getColumnCount( ) - throw (SQLException, RuntimeException, std::exception) { return m_colCount; } sal_Bool SequenceResultSetMetaData::isAutoIncrement( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].isAutoIncrement; } sal_Bool SequenceResultSetMetaData::isCaseSensitive( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return true; // ??? hmm, numeric types or } -sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ ) throw (SQLException, RuntimeException, std::exception) +sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ ) { return true; // mmm, what types are not searchable ? } -sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex( column ); return m_columnData[column-1].isCurrency; } sal_Int32 SequenceResultSetMetaData::isNullable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].isNullable ? 1 : 0; } sal_Bool SequenceResultSetMetaData::isSigned( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return true; } sal_Int32 SequenceResultSetMetaData::getColumnDisplaySize( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return 50; } OUString SequenceResultSetMetaData::getColumnLabel( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) +OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) { checkColumnIndex( column ); return m_columnData[column-1].schemaTableName; @@ -128,41 +121,35 @@ OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQL sal_Int32 SequenceResultSetMetaData::getPrecision( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].precision; } sal_Int32 SequenceResultSetMetaData::getScale( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].scale; } OUString SequenceResultSetMetaData::getTableName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].tableName; } OUString SequenceResultSetMetaData::getCatalogName( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { // can do this through XConnection.getCatalog() ! return OUString(); } sal_Int32 SequenceResultSetMetaData::getColumnType( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].type; } OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].typeName; @@ -170,30 +157,25 @@ OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) sal_Bool SequenceResultSetMetaData::isReadOnly( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return false; } sal_Bool SequenceResultSetMetaData::isWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return ! isReadOnly( column ); // what's the sense if this method ? } sal_Bool SequenceResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) - throw (SQLException, RuntimeException, std::exception) { return isWritable(column); // uhh, now it becomes really esoteric .... } OUString SequenceResultSetMetaData::getColumnServiceName( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException, std::exception) { return OUString(); } void SequenceResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_colCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx index d115b8f750c5..2bba06aa7d2f 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx @@ -53,8 +53,7 @@ namespace pq_sdbc_driver /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex( sal_Int32 columnIndex ) - throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkColumnIndex( sal_Int32 columnIndex ); public: SequenceResultSetMetaData( @@ -63,27 +62,27 @@ namespace pq_sdbc_driver public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index e465fa254ed9..26910e33fc30 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -176,7 +176,7 @@ Statement::~Statement() POSTGRE_TRACE( "dtor Statement" ); } -void Statement::checkClosed() throw (SQLException, RuntimeException ) +void Statement::checkClosed() { if( ! m_pSettings || ! m_pSettings->pConnection ) throw SQLException( @@ -184,14 +184,14 @@ void Statement::checkClosed() throw (SQLException, RuntimeException ) *this, OUString(),1,Any()); } -Any Statement::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) +Any Statement::queryInterface( const Type & rType ) { Any aRet = Statement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception ) +Sequence< Type > Statement::getTypes() { static Sequence< Type > *pCollection; if( ! pCollection ) @@ -209,12 +209,12 @@ Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception return *pCollection; } -Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException, std::exception ) +Sequence< sal_Int8> Statement::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -void Statement::close( ) throw (SQLException, RuntimeException, std::exception) +void Statement::close( ) { // let the connection die without acquired mutex ! Reference< XConnection > r; @@ -238,7 +238,6 @@ void Statement::close( ) throw (SQLException, RuntimeException, std::exception) void Statement::raiseSQLException( const OUString & sql, const char * errorMsg ) - throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); @@ -253,7 +252,6 @@ void Statement::raiseSQLException( } Reference< XResultSet > Statement::executeQuery(const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { Reference< XCloseable > lastResultSetHolder = m_lastResultset; if( lastResultSetHolder.is() ) @@ -267,7 +265,6 @@ Reference< XResultSet > Statement::executeQuery(const OUString& sql ) } sal_Int32 Statement::executeUpdate( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { if( execute( sql ) ) { @@ -283,7 +280,6 @@ static void raiseSQLException( const OString & sql, const char * errorMsg, const char *errorType = nullptr ) - throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); @@ -824,7 +820,6 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( } sal_Bool Statement::execute( const OUString& sql ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -850,7 +845,6 @@ sal_Bool Statement::execute( const OUString& sql ) } Reference< XConnection > Statement::getConnection( ) - throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > ret; { @@ -863,18 +857,15 @@ Reference< XConnection > Statement::getConnection( ) Any Statement::getWarnings( ) - throw (SQLException,RuntimeException, std::exception) { return Any(); } void Statement::clearWarnings( ) - throw (SQLException, RuntimeException, std::exception) { } Reference< css::sdbc::XResultSetMetaData > Statement::getMetaData() - throw (SQLException,RuntimeException, std::exception) { Reference< css::sdbc::XResultSetMetaData > ret; Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); @@ -892,7 +883,6 @@ Reference< css::sdbc::XResultSetMetaData > Statement::getMetaData() sal_Bool Statement::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { rOldValue = m_props[nHandle]; bool bRet; @@ -939,7 +929,7 @@ sal_Bool Statement::convertFastPropertyValue( void Statement::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) + sal_Int32 nHandle,const Any& rValue ) { m_props[nHandle] = rValue; } @@ -950,26 +940,22 @@ void Statement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } Reference < XPropertySetInfo > Statement::getPropertySetInfo() - throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getStatementPropertyArrayHelper() ); } Reference< XResultSet > Statement::getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 Statement::getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool Statement::getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return false; } @@ -981,7 +967,6 @@ void Statement::disposing() } Reference< XResultSet > Statement::getGeneratedValues( ) - throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); return getGeneratedValuesFromLastInsert( diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx index 437eac12c0e6..0ac5e40a711e 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.hxx +++ b/connectivity/source/drivers/postgresql/pq_statement.hxx @@ -98,35 +98,25 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { Statement_BASE::acquire(); } virtual void SAL_CALL release() throw() override { Statement_BASE::release(); } - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) override; public: // XCloseable - virtual void SAL_CALL close( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; public: // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; public: // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -135,13 +125,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -150,37 +138,30 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // XGeneratedResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - getGeneratedValues( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + getGeneratedValues( ) override; public: // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; public: // OComponentHelper virtual void SAL_CALL disposing() override; public: // XResultSetMetaDataSupplier (is required by framework (see // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() ) - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException); + void checkClosed(); /// @throws css::sdbc::SQLException - void raiseSQLException( const OUString & sql, const char * errorMsg ) - throw ( css::sdbc::SQLException ); + void raiseSQLException( const OUString & sql, const char * errorMsg ); }; diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index b5799eadfdad..efecdac1fad9 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -598,7 +598,7 @@ OUString array2String( const css::uno::Sequence< Any > &seq ) } -std::vector< Any > parseArray( const OUString & str ) throw( SQLException ) +std::vector< Any > parseArray( const OUString & str ) { int len = str.getLength(); bool doubleQuote = false; diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index cce2d5a640f4..ad642f724f8c 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -104,8 +104,7 @@ void tokenizeSQL( const OString & sql, OStringVector &vec ); void splitSQL( const OString & sql, OStringVector &vec ); std::vector< sal_Int32 > parseIntArray( const OUString & str ); /// @throws css::sdbc::SQLException -std::vector< css::uno::Any > parseArray( const OUString & str ) - throw( css::sdbc::SQLException ); +std::vector< css::uno::Any > parseArray( const OUString & str ); OUString array2String( const css::uno::Sequence< css::uno::Any > &seq ); diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index 64033eb9d647..3ec872e448de 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -134,7 +134,6 @@ css::uno::Reference< css::sdbc::XCloseable > UpdateableResultSet::createFromPGRe css::uno::Any UpdateableResultSet::queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) { Any ret = SequenceResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -147,7 +146,6 @@ css::uno::Any UpdateableResultSet::queryInterface( css::uno::Sequence< css::uno::Type > UpdateableResultSet::getTypes() - throw( css::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -167,7 +165,6 @@ css::uno::Sequence< css::uno::Type > UpdateableResultSet::getTypes() } css::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationId() - throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -194,7 +191,7 @@ OUString UpdateableResultSet::buildWhereClause() } -void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::insertRow( ) { MutexGuard guard( m_refMutex->mutex ); if (isLog(*m_ppSettings, LogLevel::Info)) @@ -288,7 +285,7 @@ void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, s m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateRow( ) { MutexGuard guard( m_refMutex->mutex ); if (isLog(*m_ppSettings, LogLevel::Info)) @@ -338,7 +335,7 @@ void UpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, s m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::deleteRow( ) { if (isLog(*m_ppSettings, LogLevel::Info)) { @@ -377,18 +374,18 @@ void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, s m_data.resize( m_rowCount ); } -void UpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::cancelRowUpdates( ) { MutexGuard guard( m_refMutex->mutex ); m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::moveToInsertRow( ) { m_insertRow = true; } -void UpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::moveToCurrentRow( ) { m_insertRow = false; } @@ -401,7 +398,7 @@ void UpdateableResultSet::checkUpdate( sal_Int32 columnIndex) m_updateableField[columnIndex-1].isTouched = true; } -void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -409,7 +406,7 @@ void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLExceptio m_updateableField[columnIndex-1].value = Any(); } -void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -420,17 +417,17 @@ void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) thr } -void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateInt(columnIndex,x); } -void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateInt( columnIndex, x ); } -void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateLong( columnIndex, x ); // MutexGuard guard( m_refMutex->mutex ); @@ -441,7 +438,7 @@ void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw } -void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -454,7 +451,7 @@ void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw m_updateableField[columnIndex-1].value <<= OUString::number( x ); } -void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) { MutexGuard guard( m_refMutex->mutex ); @@ -464,7 +461,7 @@ void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (S m_updateableField[columnIndex-1].value <<= OUString::number( x ); } -void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -473,7 +470,7 @@ void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw m_updateableField[columnIndex-1].value <<= OUString::number( x ); } -void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -482,7 +479,7 @@ void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x m_updateableField[columnIndex-1].value <<= x; } -void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -504,40 +501,39 @@ void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Se free( escapedString ); } -void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { updateString( columnIndex, DBTypeConversion::toDateString( x ) ); } -void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { updateString( columnIndex, DBTypeConversion::toTimeString( x ) ); } -void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { updateString( columnIndex, DBTypeConversion::toDateTimeString( x ) ); } -void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { } -void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) { } -void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */ ) { } -void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception) +void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) { } Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable ) - throw( css::uno::RuntimeException ) { if( updateable ) { diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index 040281dec8fb..a1e5f5d44033 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -126,46 +126,42 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { SequenceResultSet::acquire(); } virtual void SAL_CALL release() throw() override { SequenceResultSet::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; public: /// @throws css::uno::RuntimeException - static css::uno::Sequence< css::uno::Type > getStaticTypes( bool updateable ) - throw( css::uno::RuntimeException ); + static css::uno::Sequence< css::uno::Type > getStaticTypes( bool updateable ); }; diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index 45f37fe0430c..627e60fe4ca3 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -85,7 +85,6 @@ sal_Bool ReflectionBase::convertFastPropertyValue( css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) { rOldValue = m_values[nHandle]; @@ -113,7 +112,6 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public( void ReflectionBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) { // OUString s; // rValue >>= s; @@ -135,32 +133,27 @@ void ReflectionBase::getFastPropertyValue( } Reference < css::beans::XPropertySetInfo > ReflectionBase::getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( m_propsDesc ); } OUString ReflectionBase::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return m_implName; } sal_Bool ReflectionBase::supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > ReflectionBase::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { return m_supportedServices; } Sequence< css::uno::Type > ReflectionBase::getTypes() - throw( css::uno::RuntimeException, std::exception ) { osl::MutexGuard guard( m_refMutex->mutex ); static Sequence< css::uno::Type > collection( @@ -173,14 +166,13 @@ Sequence< css::uno::Type > ReflectionBase::getTypes() css::uno::Any ReflectionBase::queryInterface( const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) { Any ret = ReflectionBase_BASE::queryInterface( reqType ); return ret.hasValue() ? ret : OPropertySetHelper::queryInterface( reqType ); } -Sequence< sal_Int8> ReflectionBase::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> ReflectionBase::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -202,7 +194,7 @@ void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set ) } } -OUString ReflectionBase::getName( ) throw (css::uno::RuntimeException, std::exception) +OUString ReflectionBase::getName( ) { Statics & st = getStatics(); if( getInfoHelper().hasPropertyByName( st.SCHEMA_NAME ) ) @@ -215,7 +207,6 @@ OUString ReflectionBase::getName( ) throw (css::uno::RuntimeException, std::exc void ReflectionBase::setName( const OUString& /* aName */ ) - throw (css::uno::RuntimeException, std::exception) { throw RuntimeException( "pq_sdbc::ReflectionBase::setName not implemented", diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx index 17e2e0f70455..bf5359fe5fc4 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -85,8 +85,7 @@ public: //XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase_BASE::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase_BASE::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -95,13 +94,11 @@ public: // OPropertySetHelper css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -110,30 +107,24 @@ public: // OPropertySetHelper sal_Int32 nHandle ) const override; // XPropertySet - css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(css::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override = 0; + createDataDescriptor( ) override = 0; public: // XNamed - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index f8c3c2747aef..5caf2d0f88af 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -57,7 +57,7 @@ Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.column.pProps ) {} -Reference< XPropertySet > Column::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Column::createDataDescriptor( ) { ColumnDescriptor * pColumn = new ColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -78,7 +78,7 @@ ColumnDescriptor::ColumnDescriptor( *getStatics().refl.columnDescriptor.pProps ) {} -Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) { ColumnDescriptor * pColumn = new ColumnDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx index 3b833845f4f0..1a8d9ff30502 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx @@ -58,7 +58,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -72,7 +72,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index 36f3a4f8744c..da43c62d7b36 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -276,7 +276,6 @@ OUString columnMetaData2SDBCX( // }; void Columns::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -461,9 +460,6 @@ void alterColumnByDescriptor( void Columns::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& future ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); @@ -498,9 +494,6 @@ void Columns::appendByDescriptor( // } void Columns::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -535,7 +528,6 @@ void Columns::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Columns::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -566,7 +558,6 @@ ColumnDescriptors::ColumnDescriptors( Reference< css::beans::XPropertySet > ColumnDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx index d7d8e92d3ffe..d8ca464653ce 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx @@ -83,27 +83,20 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; // public: // XDrop // virtual void SAL_CALL dropByName( const OUString& elementName ) // throw (css::sdbc::SQLException, // css::container::NoSuchElementException, // css::uno::RuntimeException); - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -116,8 +109,7 @@ public: ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx index cc46f7ae93ec..2710f8bf2748 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx @@ -146,7 +146,6 @@ Container::Container( } Any Container::getByName( const OUString& aName ) - throw (NoSuchElementException,WrappedTargetException,RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( aName ); if( ii == m_name2index.end() ) @@ -164,7 +163,6 @@ Any Container::getByName( const OUString& aName ) } Sequence< OUString > Container::getElementNames( ) - throw (css::uno::RuntimeException, std::exception) { Sequence< OUString > ret( m_values.size() ); for( String2IntMap::const_iterator ii = m_name2index.begin(); @@ -179,27 +177,21 @@ Sequence< OUString > Container::getElementNames( ) } sal_Bool Container::hasByName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) { return m_name2index.find( aName ) != m_name2index.end(); } // Methods Type Container::getElementType( ) - throw (css::uno::RuntimeException, std::exception) { return Type(); } sal_Bool Container::hasElements( ) - throw (css::uno::RuntimeException, std::exception) { return ! m_name2index.empty(); } Any Container::getByIndex( sal_Int32 Index ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if( Index < 0 || Index >= (sal_Int32)m_values.size() ) { @@ -216,7 +208,6 @@ Any Container::getByIndex( sal_Int32 Index ) } sal_Int32 Container::getCount() - throw (css::uno::RuntimeException, std::exception) { return m_values.size(); } @@ -234,25 +225,17 @@ public: public: // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement( ) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual css::uno::Any SAL_CALL nextElement( ) override; }; sal_Bool ContainerEnumeration::hasMoreElements() - throw (css::uno::RuntimeException, std::exception) { return (int)m_vec.size() > m_index +1; } css::uno::Any ContainerEnumeration::nextElement() - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if( ! hasMoreElements() ) { @@ -264,21 +247,18 @@ css::uno::Any ContainerEnumeration::nextElement() } Reference< XEnumeration > Container::createEnumeration( ) - throw (css::uno::RuntimeException, std::exception) { return new ContainerEnumeration( m_values ); } void Container::addRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l ); } void Container::removeRefreshListener( const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l ); } @@ -307,9 +287,6 @@ void Container::rename( const OUString &oldName, const OUString &newName ) } void Container::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); String2IntMap::const_iterator ii = m_name2index.find( elementName ); @@ -332,9 +309,6 @@ void Container::dropByName( const OUString& elementName ) } void Container::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >=(sal_Int32)m_values.size() ) @@ -387,7 +361,6 @@ void Container::dropByIndex( sal_Int32 index ) void Container::append( const OUString & name, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw ( css::container::ElementExistException ) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -413,9 +386,6 @@ void Container::append( void Container::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { append( extractStringProperty( descriptor, getStatics().NAME ), descriptor ); } @@ -423,14 +393,12 @@ void Container::appendByDescriptor( void Container::addContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l ); } void Container::removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& l ) - throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l ); } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 6c7a80c113f9..fd595c639e08 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -123,81 +123,55 @@ public: ); public: // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; public: // XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > - SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL createEnumeration( ) override; public: // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Methods - virtual css::uno::Type SAL_CALL getElementType( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; public: // XAppend // Must be overridden in Non-Descriptors. May be overridden in descriptors, when // PropertySet.NAME != container name virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; // helper method ! /// @throws css::container::ElementExistException void append( const OUString & str, - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw ( css::container::ElementExistException ); + const css::uno::Reference< css::beans::XPropertySet >& descriptor ); public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override = 0; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL refresh( ) override {} virtual void SAL_CALL addRefreshListener( - const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener >& l ) override; virtual void SAL_CALL removeRefreshListener( - const css::uno::Reference< css::util::XRefreshListener >& l ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener >& l ) override; public: // Methods virtual void SAL_CALL addContainerListener( - const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XContainerListener >& xListener ) override; virtual void SAL_CALL removeContainerListener( - const css::uno::Reference< css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XContainerListener >& xListener ) override; public: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 688d1d77a40c..60169554e9d6 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -78,7 +78,7 @@ Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex, m_tableName( tableName ) {} -Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Index::createDataDescriptor( ) { IndexDescriptor * pIndex = new IndexDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -87,7 +87,7 @@ Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > Index::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Index::getColumns( ) { if( ! m_indexColumns.is() ) { @@ -101,7 +101,7 @@ Reference< XNameAccess > Index::getColumns( ) throw (css::uno::RuntimeException return m_indexColumns; } -Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > Index::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -118,12 +118,12 @@ Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> Index::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> Index::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any Index::queryInterface( const Type & reqType ) { Any ret; @@ -149,7 +149,7 @@ IndexDescriptor::IndexDescriptor( * getStatics().refl.indexDescriptor.pProps ) {} -Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) { IndexDescriptor * pIndex = new IndexDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -157,7 +157,7 @@ Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (Runti return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > IndexDescriptor::getColumns( ) { if( ! m_indexColumns.is() ) { @@ -173,7 +173,7 @@ Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (css::uno::Runtim return m_indexColumns; } -Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > IndexDescriptor::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -190,12 +190,12 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::except return pCollection->getTypes(); } -Sequence< sal_Int8> IndexDescriptor::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> IndexDescriptor::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any IndexDescriptor::queryInterface( const Type & reqType ) { Any ret; diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx index 89795324127c..7f22f1215575 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx @@ -69,22 +69,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -104,22 +101,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx index bb01c7f30423..ef2ceffebaa7 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx @@ -57,7 +57,7 @@ IndexColumn::IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.indexColumn.pProps ) {} -Reference< XPropertySet > IndexColumn::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > IndexColumn::createDataDescriptor( ) { IndexColumnDescriptor * pIndexColumn = new IndexColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -80,7 +80,7 @@ IndexColumnDescriptor::IndexColumnDescriptor( * getStatics().refl.indexColumnDescriptor.pProps ) {} -Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor( ) { IndexColumnDescriptor * pIndexColumn = new IndexColumnDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx index 42c249b64958..9dada6d18b10 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx @@ -59,7 +59,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -73,7 +73,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index b8b4738a045a..09caf4829691 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -101,7 +101,6 @@ static sal_Int32 findInSequence( const Sequence< OUString > & seq , const OUStri } void IndexColumns::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -157,9 +156,6 @@ void IndexColumns::refresh() void IndexColumns::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& /*future*/ ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { throw css::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.appendByDescriptor not yet implemented", @@ -174,9 +170,6 @@ void IndexColumns::appendByDescriptor( } void IndexColumns::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { (void) elementName; throw css::sdbc::SQLException( @@ -200,9 +193,6 @@ void IndexColumns::dropByName( const OUString& elementName ) } void IndexColumns::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { (void) index; throw css::sdbc::SQLException( @@ -240,7 +230,6 @@ void IndexColumns::dropByIndex( sal_Int32 index ) Reference< css::beans::XPropertySet > IndexColumns::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -279,7 +268,6 @@ Reference< css::container::XNameAccess > IndexColumnDescriptors::create( } css::uno::Reference< css::beans::XPropertySet > IndexColumnDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx index 7134316a05e4..9c1b856dbfd4 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx @@ -73,27 +73,17 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -113,8 +103,7 @@ protected: ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index b5f2c871eff0..19001cf040ea 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -90,7 +90,6 @@ Indexes::~Indexes() {} void Indexes::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -190,9 +189,6 @@ void Indexes::refresh() void Indexes::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { Statics & st = getStatics(); OUString name = extractStringProperty( descriptor, st.NAME ); @@ -241,9 +237,6 @@ void Indexes::appendByDescriptor( } void Indexes::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { @@ -274,7 +267,6 @@ void Indexes::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Indexes::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -309,7 +301,6 @@ Reference< css::container::XNameAccess > IndexDescriptors::create( } css::uno::Reference< css::beans::XPropertySet > IndexDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new IndexDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.hxx b/connectivity/source/drivers/postgresql/pq_xindexes.hxx index 34d15b53df58..a4d0e48d9467 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx @@ -66,23 +66,16 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -101,8 +94,7 @@ protected: ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index ac15478a9282..0e3ab48782e4 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -78,7 +78,7 @@ Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex, m_tableName( tableName ) {} -Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Key::createDataDescriptor( ) { KeyDescriptor * pKeyDescriptor = new KeyDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -87,7 +87,7 @@ Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException, return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > Key::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Key::getColumns( ) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -103,7 +103,7 @@ Reference< XNameAccess > Key::getColumns( ) throw (css::uno::RuntimeException, return m_keyColumns; } -Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > Key::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -120,12 +120,12 @@ Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> Key::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> Key::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any Key::queryInterface( const Type & reqType ) { Any ret; @@ -151,7 +151,7 @@ KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMut { } -Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) { KeyDescriptor * pKeyDescriptor = new KeyDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -160,7 +160,7 @@ Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (Runtime return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > KeyDescriptor::getColumns( ) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -170,7 +170,7 @@ Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (css::uno::RuntimeE return m_keyColumns; } -Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > KeyDescriptor::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -187,12 +187,12 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exceptio return pCollection->getTypes(); } -Sequence< sal_Int8> KeyDescriptor::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> KeyDescriptor::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any KeyDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any KeyDescriptor::queryInterface( const Type & reqType ) { Any ret; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx index c416a9438b60..1b22047e89c4 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx @@ -69,22 +69,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -102,22 +99,19 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx index 4493bd8a91ae..57c4f400067a 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx @@ -57,7 +57,7 @@ KeyColumn::KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.keycolumn.pProps ) {} -Reference< XPropertySet > KeyColumn::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > KeyColumn::createDataDescriptor( ) { KeyColumnDescriptor * pKeyColumn = new KeyColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -79,7 +79,7 @@ KeyColumnDescriptor::KeyColumnDescriptor( * getStatics().refl.keycolumnDescriptor.pProps ) {} -Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor( ) { KeyColumnDescriptor * pKeyColumn = new KeyColumnDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx index 2c7ff37235a5..bf102777b730 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx @@ -58,7 +58,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; @@ -72,7 +72,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index e5e1ddb748c8..47dd4d2442b0 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -87,7 +87,6 @@ KeyColumns::~KeyColumns() void KeyColumns::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -159,9 +158,6 @@ void KeyColumns::refresh() void KeyColumns::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& future ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { (void) future; throw css::sdbc::SQLException( @@ -179,9 +175,6 @@ void KeyColumns::appendByDescriptor( void KeyColumns::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { (void) index; throw css::sdbc::SQLException( @@ -219,7 +212,6 @@ void KeyColumns::dropByIndex( sal_Int32 index ) Reference< css::beans::XPropertySet > KeyColumns::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -250,7 +242,6 @@ KeyColumnDescriptors::KeyColumnDescriptors( {} Reference< css::beans::XPropertySet > KeyColumnDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx index 6d60413ab8ca..2c5d1a7c34a3 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx @@ -73,23 +73,16 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -102,8 +95,7 @@ public: ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } #endif diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx index ddfbdbca7d56..4fd0f3390544 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx @@ -106,7 +106,6 @@ static sal_Int32 string2keyrule( const OUString & rule ) } void Keys::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -207,9 +206,6 @@ void Keys::refresh() void Keys::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -226,9 +222,6 @@ void Keys::appendByDescriptor( void Keys::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -257,7 +250,6 @@ void Keys::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Keys::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -292,7 +284,6 @@ Reference< css::container::XIndexAccess > KeyDescriptors::create( } css::uno::Reference< css::beans::XPropertySet > KeyDescriptors::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new KeyDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.hxx b/connectivity/source/drivers/postgresql/pq_xkeys.hxx index df0f21b7b619..27ec7c64ca62 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx @@ -66,23 +66,16 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; @@ -101,8 +94,7 @@ protected: ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index ddc96f61aaa8..8da4a6d4f406 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -88,7 +88,7 @@ Table::Table( const ::rtl::Reference< RefCountedMutex > & refMutex, m_pColumns( nullptr ) {} -Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > Table::createDataDescriptor( ) { TableDescriptor * pTable = new TableDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -97,7 +97,7 @@ Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pTable ); } -Reference< XNameAccess > Table::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Table::getColumns( ) { if( ! m_columns.is() ) { @@ -112,7 +112,7 @@ Reference< XNameAccess > Table::getColumns( ) throw (css::uno::RuntimeException return m_columns; } -Reference< XNameAccess > Table::getIndexes() throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > Table::getIndexes() { if( ! m_indexes.is() ) { @@ -126,7 +126,7 @@ Reference< XNameAccess > Table::getIndexes() throw (css::uno::RuntimeException, return m_indexes; } -Reference< XIndexAccess > Table::getKeys( ) throw (css::uno::RuntimeException, std::exception) +Reference< XIndexAccess > Table::getKeys( ) { if( ! m_keys.is() ) { @@ -141,9 +141,6 @@ Reference< XIndexAccess > Table::getKeys( ) throw (css::uno::RuntimeException, } void Table::rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); @@ -229,7 +226,6 @@ void Table::rename( const OUString& newName ) void Table::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) - throw (SQLException,NoSuchElementException,RuntimeException, std::exception) { Reference< css::container::XNameAccess > columns = Reference< css::container::XNameAccess > ( getColumns(), UNO_QUERY ); @@ -253,7 +249,6 @@ void Table::alterColumnByName( void Table::alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (SQLException,IndexOutOfBoundsException,RuntimeException, std::exception) { Reference< css::container::XIndexAccess > columns = Reference< css::container::XIndexAccess>( getColumns(), UNO_QUERY ); @@ -268,7 +263,7 @@ void Table::alterColumnByIndex( m_pColumns->refresh(); } -Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > Table::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -289,12 +284,12 @@ Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> Table::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> Table::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any Table::queryInterface( const Type & reqType ) { Any ret; @@ -311,7 +306,7 @@ Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std:: return ret; } -OUString Table::getName( ) throw (css::uno::RuntimeException, std::exception) +OUString Table::getName( ) { Statics & st = getStatics(); return concatQualified( @@ -319,7 +314,7 @@ OUString Table::getName( ) throw (css::uno::RuntimeException, std::exception) extractStringProperty( this, st.NAME ) ); } -void Table::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) +void Table::setName( const OUString& aName ) { rename( aName ); } @@ -339,7 +334,7 @@ TableDescriptor::TableDescriptor( { } -Reference< XNameAccess > TableDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > TableDescriptor::getColumns( ) { if( ! m_columns.is() ) { @@ -348,7 +343,7 @@ Reference< XNameAccess > TableDescriptor::getColumns( ) throw (css::uno::Runtim return m_columns; } -Reference< XNameAccess > TableDescriptor::getIndexes() throw (css::uno::RuntimeException, std::exception) +Reference< XNameAccess > TableDescriptor::getIndexes() { if( ! m_indexes.is() ) { @@ -360,7 +355,7 @@ Reference< XNameAccess > TableDescriptor::getIndexes() throw (css::uno::RuntimeE return m_indexes; } -Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (css::uno::RuntimeException, std::exception) +Reference< XIndexAccess > TableDescriptor::getKeys( ) { if( ! m_keys.is() ) { @@ -373,7 +368,7 @@ Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (css::uno::RuntimeE } -Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > TableDescriptor::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -392,12 +387,12 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::except return pCollection->getTypes(); } -Sequence< sal_Int8> TableDescriptor::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> TableDescriptor::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any TableDescriptor::queryInterface( const Type & reqType ) { Any ret; @@ -412,7 +407,7 @@ Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept } -Reference< XPropertySet > TableDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > TableDescriptor::createDataDescriptor( ) { TableDescriptor * pTable = new TableDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index 759dddad8a68..09fe3cbac88c 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -77,55 +77,43 @@ public: virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; // XIndexesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getIndexes( ) throw (css::uno::RuntimeException, std::exception) override; + getIndexes( ) override; // XKeysSupplier virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getKeys( ) throw (css::uno::RuntimeException, std::exception) override; + getKeys( ) override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) override; // XAlterTable virtual void SAL_CALL alterColumnByName( const OUString& colName, - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; }; @@ -149,30 +137,27 @@ public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; public: // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; public: // XColumnsSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getColumns( ) throw (css::uno::RuntimeException, std::exception) override; + getColumns( ) override; public: // XIndexesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL - getIndexes( ) throw (css::uno::RuntimeException, std::exception) override; + getIndexes( ) override; public: // XKeysSupplier virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL - getKeys( ) throw (css::uno::RuntimeException, std::exception) override; + getKeys( ) override; public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx index cbd5c3f2b695..b5d39baa276d 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx @@ -82,7 +82,6 @@ Tables::~Tables() {} void Tables::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -236,9 +235,6 @@ static void appendKeyList( void Tables::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Reference< XStatement > stmt = @@ -313,9 +309,6 @@ void Tables::appendByDescriptor( } void Tables::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -355,7 +348,6 @@ void Tables::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Tables::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new TableDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx index 9eb675e3f933..a3390cc2c1c3 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx @@ -62,27 +62,20 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop // virtual void SAL_CALL dropByName( const OUString& elementName ) // throw (css::sdbc::SQLException, // css::container::NoSuchElementException, // css::uno::RuntimeException); - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; protected: using Container::disposing; diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx index 6b32bd667e72..e1471cb0a2ee 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.cxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx @@ -74,7 +74,7 @@ User::User( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.user.pProps ) {} -Reference< XPropertySet > User::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > User::createDataDescriptor( ) { UserDescriptor * pUser = new UserDescriptor( m_refMutex, m_conn, m_pSettings ); pUser->copyValuesFrom( this ); @@ -83,7 +83,7 @@ Reference< XPropertySet > User::createDataDescriptor( ) throw (RuntimeException } -Sequence<Type > User::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > User::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -100,12 +100,12 @@ Sequence<Type > User::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> User::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> User::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any User::queryInterface( const Type & reqType ) { Any ret; @@ -120,7 +120,6 @@ Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::e void User::changePassword( const OUString& oldPassword, const OUString& newPassword ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) oldPassword; OUStringBuffer buf(128); @@ -134,7 +133,6 @@ void User::changePassword( } sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { sal_Int32 ret = 0xffffffff; if (isLog(m_pSettings, LogLevel::Info)) @@ -152,7 +150,6 @@ sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) } sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; // all privileges @@ -160,7 +157,6 @@ sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objTy } void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", @@ -168,7 +164,6 @@ void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int3 } void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", @@ -189,7 +184,7 @@ UserDescriptor::UserDescriptor( * getStatics().refl.userDescriptor.pProps ) {} -Reference< XPropertySet > UserDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > UserDescriptor::createDataDescriptor( ) { UserDescriptor * pUser = new UserDescriptor( m_refMutex, m_conn, m_pSettings ); pUser->copyValuesFrom( this ); diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx index 68ee639201b2..445e6814ec0f 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.hxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx @@ -62,25 +62,22 @@ public: virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; // XUser : XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) override; }; class UserDescriptor : public ReflectionBase @@ -93,7 +90,7 @@ public: public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx index e92158e823d4..aae6c1b551f7 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.cxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx @@ -72,7 +72,6 @@ Users::~Users() {} void Users::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -118,9 +117,6 @@ void Users::refresh() void Users::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -136,9 +132,6 @@ void Users::appendByDescriptor( } void Users::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) @@ -154,9 +147,6 @@ void Users::dropByName( const OUString& elementName ) } void Users::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -188,7 +178,6 @@ void Users::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Users::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new UserDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xusers.hxx b/connectivity/source/drivers/postgresql/pq_xusers.hxx index 6ecddfe302ff..ef05a2b1307c 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.hxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx @@ -61,27 +61,17 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; protected: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index c42f533a410f..3a85d52cc510 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -78,7 +78,7 @@ View::View( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.view.pProps ) {} -Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > View::createDataDescriptor( ) { ViewDescriptor * pView = new ViewDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -88,9 +88,6 @@ Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException } void View::rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -158,7 +155,7 @@ void View::rename( const OUString& newName ) } } -Sequence<Type > View::getTypes() throw( RuntimeException, std::exception ) +Sequence<Type > View::getTypes() { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -175,12 +172,12 @@ Sequence<Type > View::getTypes() throw( RuntimeException, std::exception ) return pCollection->getTypes(); } -Sequence< sal_Int8> View::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8> View::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } -Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) +Any View::queryInterface( const Type & reqType ) { Any ret; @@ -193,7 +190,7 @@ Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::e return ret; } -OUString View::getName( ) throw (css::uno::RuntimeException, std::exception) +OUString View::getName( ) { Statics & st = getStatics(); return concatQualified( @@ -201,7 +198,7 @@ OUString View::getName( ) throw (css::uno::RuntimeException, std::exception) extractStringProperty( this, st.NAME ) ); } -void View::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) +void View::setName( const OUString& aName ) { rename( aName ); } @@ -220,7 +217,7 @@ ViewDescriptor::ViewDescriptor( * getStatics().refl.viewDescriptor.pProps ) {} -Reference< XPropertySet > ViewDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) +Reference< XPropertySet > ViewDescriptor::createDataDescriptor( ) { ViewDescriptor * pView = new ViewDescriptor( m_refMutex, m_conn, m_pSettings ); diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx index 7b9270420b2c..39fdc0d7f69c 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.hxx +++ b/connectivity/source/drivers/postgresql/pq_xview.hxx @@ -61,28 +61,22 @@ public: virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type & reqType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type & reqType ) override; // XTypeProvider, first implemented by OPropertySetHelper - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override; // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename( const OUString& newName ) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; }; @@ -96,7 +90,7 @@ public: // XDataDescriptorFactory virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; + createDataDescriptor( ) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index cd12d586687c..311fb888494a 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -73,7 +73,6 @@ Views::~Views() {} void Views::refresh() - throw (css::uno::RuntimeException, std::exception) { try { @@ -132,9 +131,6 @@ void Views::refresh() void Views::appendByDescriptor( const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -163,9 +159,6 @@ void Views::appendByDescriptor( } void Views::dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) @@ -179,9 +172,6 @@ void Views::dropByName( const OUString& elementName ) } void Views::dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -210,7 +200,6 @@ void Views::dropByIndex( sal_Int32 index ) css::uno::Reference< css::beans::XPropertySet > Views::createDataDescriptor() - throw (css::uno::RuntimeException, std::exception) { return new ViewDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx index 1debff30d494..bfca9392529f 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.hxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx @@ -62,27 +62,17 @@ protected: public: // XAppend virtual void SAL_CALL appendByDescriptor( - const css::uno::Reference< css::beans::XPropertySet >& descriptor ) - throw (css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; public: // XDrop - virtual void SAL_CALL dropByName( const OUString& elementName ) - throw (css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dropByName( const OUString& elementName ) override; + virtual void SAL_CALL dropByIndex( sal_Int32 index ) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) override; public: // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; protected: using Container::disposing; |