diff options
Diffstat (limited to 'connectivity/source/drivers/postgresql')
62 files changed, 1055 insertions, 1055 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx index da0df9ce5610..d11fc49233fa 100644 --- a/connectivity/source/drivers/postgresql/pq_array.cxx +++ b/connectivity/source/drivers/postgresql/pq_array.cxx @@ -54,20 +54,20 @@ namespace pq_sdbc_driver OUString Array::getBaseTypeName( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return OUString( "varchar" ); } sal_Int32 Array::getBaseType( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return com::sun::star::sdbc::DataType::VARCHAR; } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Array::getArray( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& /* typeMap */ ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_data; } @@ -76,7 +76,7 @@ sal_Int32 Array::getBaseType( ) sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& /* typeMap */ ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { checkRange( index, count ); return Sequence< Any > ( &m_data[index-1], count ); @@ -84,7 +84,7 @@ sal_Int32 Array::getBaseType( ) ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > Array::getResultSet( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return getResultSetAtIndex( 0 , m_data.getLength() , typeMap ); } @@ -93,7 +93,7 @@ sal_Int32 Array::getBaseType( ) sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& /* typeMap */ ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { checkRange( index, count ); Sequence< Sequence< Any > > ret( count ); diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx index ccc62d906c3b..934532cd0605 100644 --- a/connectivity/source/drivers/postgresql/pq_array.hxx +++ b/connectivity/source/drivers/postgresql/pq_array.hxx @@ -67,31 +67,31 @@ public: // XArray // Methods virtual OUString SAL_CALL getBaseTypeName( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getBaseType( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getArray( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getArrayAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); 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 747f15a6da22..d51d9ee3ae67 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -159,7 +159,7 @@ BaseResultSet::~BaseResultSet() POSTGRE_TRACE( "dtor BaseResultSet" ); } -Any BaseResultSet::queryInterface( const Type & reqType ) throw (RuntimeException) +Any BaseResultSet::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -193,7 +193,7 @@ Any BaseResultSet::queryInterface( const Type & reqType ) throw (RuntimeExceptio // } // } -Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException ) +Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -217,7 +217,7 @@ Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException, std::exception ) { static cppu::OImplementationId *pId; if( ! pId ) @@ -239,7 +239,7 @@ Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException // return new ResultSetMetaData( m_refMutex, this, &m_result ); // } -sal_Bool BaseResultSet::next( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::next( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -247,49 +247,49 @@ sal_Bool BaseResultSet::next( ) throw (SQLException, RuntimeException) return m_row < m_rowCount; } -sal_Bool BaseResultSet::isBeforeFirst( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::isBeforeFirst( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row == -1; } -sal_Bool BaseResultSet::isAfterLast( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::isAfterLast( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row >= m_rowCount; } -sal_Bool BaseResultSet::isFirst( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::isFirst( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row == 0 && m_rowCount; } -sal_Bool BaseResultSet::isLast( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::isLast( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row >= 0 && m_row + 1 == m_rowCount; } -void BaseResultSet::beforeFirst( ) throw (SQLException, RuntimeException) +void BaseResultSet::beforeFirst( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); m_row = -1; } -void BaseResultSet::afterLast( ) throw (SQLException, RuntimeException) +void BaseResultSet::afterLast( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); m_row = m_rowCount; } -sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -299,7 +299,7 @@ sal_Bool BaseResultSet::first( ) throw (SQLException, RuntimeException) return bRet; } -sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -309,14 +309,14 @@ sal_Bool BaseResultSet::last( ) throw (SQLException, RuntimeException) return bRet; } -sal_Int32 BaseResultSet::getRow( ) throw (SQLException, RuntimeException) +sal_Int32 BaseResultSet::getRow( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); return m_row +1; } -sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -335,7 +335,7 @@ sal_Bool BaseResultSet::absolute( sal_Int32 row ) throw (SQLException, RuntimeEx return sal_True; } -sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -348,7 +348,7 @@ sal_Bool BaseResultSet::relative( sal_Int32 rows ) throw (SQLException, RuntimeE return sal_True; } -sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -358,27 +358,27 @@ sal_Bool BaseResultSet::previous( ) throw (SQLException, RuntimeException) return bRet; } -void BaseResultSet::refreshRow( ) throw (SQLException, RuntimeException) +void BaseResultSet::refreshRow( ) throw (SQLException, RuntimeException, std::exception) { // TODO: not supported for now } -sal_Bool BaseResultSet::rowUpdated( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::rowUpdated( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool BaseResultSet::rowInserted( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::rowInserted( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool BaseResultSet::rowDeleted( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::rowDeleted( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, RuntimeException) +Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -388,7 +388,7 @@ Reference< XInterface > BaseResultSet::getStatement() throw (SQLException, Runti //----------------- XRow interface ---------------------------------------------------- -sal_Bool BaseResultSet::wasNull( ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::wasNull( ) throw (SQLException, RuntimeException, std::exception) { return m_wasNull; } @@ -407,7 +407,7 @@ Any BaseResultSet::convertTo( const Any & val , const Type & type ) return aRet; } -sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, RuntimeException) +sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -433,7 +433,7 @@ sal_Bool BaseResultSet::getBoolean( sal_Int32 columnIndex ) throw (SQLException, } sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -445,7 +445,7 @@ sal_Int8 BaseResultSet::getByte( sal_Int32 columnIndex ) } sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -456,7 +456,7 @@ sal_Int16 BaseResultSet::getShort( sal_Int32 columnIndex ) return i; } -OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, RuntimeException) +OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex); checkClosed(); @@ -469,7 +469,7 @@ OUString BaseResultSet::getString( sal_Int32 columnIndex ) throw (SQLException, } sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -481,7 +481,7 @@ sal_Int32 BaseResultSet::getInt( sal_Int32 columnIndex ) } sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -493,7 +493,7 @@ sal_Int64 BaseResultSet::getLong( sal_Int32 columnIndex ) } float BaseResultSet::getFloat( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -505,7 +505,7 @@ float BaseResultSet::getFloat( sal_Int32 columnIndex ) } double BaseResultSet::getDouble( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -516,7 +516,7 @@ double BaseResultSet::getDouble( sal_Int32 columnIndex ) } Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -543,32 +543,32 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) ::com::sun::star::util::Date BaseResultSet::getDate( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDate( getString( columnIndex ) ); } ::com::sun::star::util::Time BaseResultSet::getTime( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toTime( getString( columnIndex ) ); } ::com::sun::star::util::DateTime BaseResultSet::getTimestamp( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDateTime( getString( columnIndex ) ); } // LEM TODO: these look like they are missing an actual implementation Reference< ::com::sun::star::io::XInputStream > BaseResultSet::getBinaryStream( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return 0; } Reference< ::com::sun::star::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return 0; } @@ -576,31 +576,31 @@ Reference< ::com::sun::star::io::XInputStream > BaseResultSet::getCharacterStrea Any BaseResultSet::getObject( sal_Int32 /* columnIndex */, const Reference< ::com::sun::star::container::XNameAccess >& /* typeMap */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return Any(); } Reference< ::com::sun::star::sdbc::XRef > BaseResultSet::getRef( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return Reference< com::sun::star::sdbc::XRef > (); } Reference< ::com::sun::star::sdbc::XBlob > BaseResultSet::getBlob( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return Reference< com::sun::star::sdbc::XBlob > (); } Reference< ::com::sun::star::sdbc::XClob > BaseResultSet::getClob( sal_Int32 /* columnIndex */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return Reference< com::sun::star::sdbc::XClob > (); } Reference< ::com::sun::star::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return new Array( m_refMutex, parseArray( getString( columnIndex ) ), *this, m_tc ); } @@ -656,7 +656,7 @@ sal_Bool BaseResultSet::convertFastPropertyValue( void BaseResultSet::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception) + sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) { m_props[nHandle] = rValue; } @@ -667,7 +667,7 @@ void BaseResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } Reference < XPropertySetInfo > BaseResultSet::getPropertySetInfo() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getResultSetPropertyArrayHelper() ); } diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index cc009d37fc27..9bdc314bc3a6 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -107,7 +107,7 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XCloseable // virtual void SAL_CALL close( ) @@ -115,9 +115,9 @@ public: // XCloseable public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XResultSetMetaDataSupplier // virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) @@ -126,86 +126,86 @@ public: // XResultSetMetaDataSupplier public: // XResultSet // Methods virtual sal_Bool SAL_CALL next( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBeforeFirst( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAfterLast( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isFirst( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLast( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL beforeFirst( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL afterLast( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL first( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL last( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getRow( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL previous( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL refreshRow( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowUpdated( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowInserted( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowDeleted( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XRow virtual sal_Bool SAL_CALL wasNull( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XColumnLocate // virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) @@ -224,7 +224,7 @@ public: // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -234,7 +234,7 @@ public: // OPropertySetHelper // XPropertySet ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); public: // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 852867daa562..6b6911bd35f4 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -121,7 +121,7 @@ public: m_conn->release(); } - virtual void SAL_CALL dispose() throw () + virtual void SAL_CALL dispose() throw (std::exception) { if( m_conn ) { @@ -216,7 +216,7 @@ typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::X typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > , ::pq_sdbc_driver::Allocator < ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > > > DisposeableList; -void Connection::close() throw ( SQLException, RuntimeException ) +void Connection::close() throw ( SQLException, RuntimeException, std::exception ) { CloseableList lst; DisposeableList lstDispose; @@ -270,7 +270,7 @@ void Connection::removeFromWeakMap( const ::rtl::ByteSequence & id ) m_myStatements.erase( ii ); } -Reference< XStatement > Connection::createStatement() throw (SQLException, RuntimeException) +Reference< XStatement > Connection::createStatement() throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -285,7 +285,7 @@ Reference< XStatement > Connection::createStatement() throw (SQLException, Runti } Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sql ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -302,7 +302,7 @@ Reference< XPreparedStatement > Connection::prepareStatement( const OUString& sq } Reference< XPreparedStatement > Connection::prepareCall( const OUString& ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { throw SQLException( OUString( "pq_driver: Callable statements not supported" ), @@ -311,39 +311,39 @@ Reference< XPreparedStatement > Connection::prepareCall( const OUString& ) OUString Connection::nativeSQL( const OUString& sql ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return sql; } -void Connection::setAutoCommit( sal_Bool ) throw (SQLException, RuntimeException) +void Connection::setAutoCommit( sal_Bool ) throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -sal_Bool Connection::getAutoCommit() throw (SQLException, RuntimeException) +sal_Bool Connection::getAutoCommit() throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED return sal_True; } -void Connection::commit() throw (SQLException, RuntimeException) +void Connection::commit() throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -void Connection::rollback() throw (SQLException, RuntimeException) +void Connection::rollback() throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -sal_Bool Connection::isClosed() throw (SQLException, RuntimeException) +sal_Bool Connection::isClosed() throw (SQLException, RuntimeException, std::exception) { return m_settings.pConnection == 0; } Reference< XDatabaseMetaData > Connection::getMetaData() - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -352,25 +352,25 @@ Reference< XDatabaseMetaData > Connection::getMetaData() return m_meta; } -void Connection::setReadOnly( sal_Bool ) throw (SQLException, RuntimeException) +void Connection::setReadOnly( sal_Bool ) throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -sal_Bool Connection::isReadOnly() throw (SQLException, RuntimeException) +sal_Bool Connection::isReadOnly() throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED return sal_False; } void Connection::setCatalog( const OUString& ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -OUString Connection::getCatalog() throw (SQLException, RuntimeException) +OUString Connection::getCatalog() throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); if( m_settings.pConnection == 0 ) @@ -383,18 +383,18 @@ OUString Connection::getCatalog() throw (SQLException, RuntimeException) } void Connection::setTransactionIsolation( sal_Int32 ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED } -sal_Int32 Connection::getTransactionIsolation() throw (SQLException, RuntimeException) +sal_Int32 Connection::getTransactionIsolation() throw (SQLException, RuntimeException, std::exception) { // UNSUPPORTED return 0; } -Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeException) +Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeException, std::exception) { Reference< XNameAccess > t; { @@ -405,17 +405,17 @@ Reference< XNameAccess > Connection::getTypeMap() throw (SQLException, RuntimeEx } void Connection::setTypeMap( const Reference< XNameAccess >& typeMap ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); m_typeMap = typeMap; } -Any Connection::getWarnings() throw (SQLException, RuntimeException) +Any Connection::getWarnings() throw (SQLException, RuntimeException, std::exception) { return Any(); } -void Connection::clearWarnings() throw (SQLException, RuntimeException) +void Connection::clearWarnings() throw (SQLException, RuntimeException, std::exception) { } @@ -501,7 +501,7 @@ static void properties2arrays( const Sequence< PropertyValue > & args, } void Connection::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { OUString url; Sequence< PropertyValue > args; @@ -631,7 +631,7 @@ void Connection::checkClosed() throw ( SQLException, RuntimeException ) } Reference< XNameAccess > Connection::getTables() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( isLog( &m_settings, LogLevel::INFO ) ) { @@ -647,7 +647,7 @@ Reference< XNameAccess > Connection::getTables() } Reference< XNameAccess > Connection::getViews() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( isLog( &m_settings, LogLevel::INFO ) ) { @@ -665,7 +665,7 @@ Reference< XNameAccess > Connection::getViews() Reference< XNameAccess > Connection::getUsers() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if( isLog( &m_settings, LogLevel::INFO ) ) { diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 4d6cd3003f23..305f51828146 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -188,69 +188,69 @@ public: public: // XCloseable virtual void SAL_CALL close() - throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception ); public: // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL nativeSQL( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getAutoCommit( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL commit( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL rollback( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isClosed( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isReadOnly( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCatalog( const OUString& catalog ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getCatalog( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); public: // XTablesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XUsersSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XViewsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getViews( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getViews( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index de77414c20fd..0f3dde69e484 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -143,36 +143,36 @@ DatabaseMetaData::DatabaseMetaData( init_getPrivs_stmt(); } -sal_Bool DatabaseMetaData::allProceduresAreCallable( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::allProceduresAreCallable( ) throw (SQLException, RuntimeException, std::exception) { // TODO return sal_False; } -sal_Bool DatabaseMetaData::allTablesAreSelectable( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::allTablesAreSelectable( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -OUString DatabaseMetaData::getURL( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getURL( ) throw (SQLException, RuntimeException, std::exception) { // TODO // LEM TODO: implement return OUString(); } -OUString DatabaseMetaData::getUserName( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getUserName( ) throw (SQLException, RuntimeException, std::exception) { return m_pSettings->user; } -sal_Bool DatabaseMetaData::isReadOnly( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::isReadOnly( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) throw (SQLException, RuntimeException, std::exception) { // 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() @@ -180,51 +180,51 @@ sal_Bool DatabaseMetaData::nullsAreSortedHigh( ) throw (SQLException, RuntimeEx return sal_True; } -sal_Bool DatabaseMetaData::nullsAreSortedLow( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::nullsAreSortedLow( ) throw (SQLException, RuntimeException, std::exception) { return ! nullsAreSortedHigh(); } -sal_Bool DatabaseMetaData::nullsAreSortedAtStart( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::nullsAreSortedAtStart( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::nullsAreSortedAtEnd( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::nullsAreSortedAtEnd( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -OUString DatabaseMetaData::getDatabaseProductName( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getDatabaseProductName( ) throw (SQLException, RuntimeException, std::exception) { return OUString("PostgreSQL"); } -OUString DatabaseMetaData::getDatabaseProductVersion( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getDatabaseProductVersion( ) throw (SQLException, RuntimeException, std::exception) { return OUString::createFromAscii( PQparameterStatus( m_pSettings->pConnection, "server_version" ) ); } -OUString DatabaseMetaData::getDriverName( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getDriverName( ) throw (SQLException, RuntimeException, std::exception) { return OUString("postgresql-sdbc"); } -OUString DatabaseMetaData::getDriverVersion( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getDriverVersion( ) throw (SQLException, RuntimeException, std::exception) { return OUString(PQ_SDBC_DRIVER_VERSION); } -sal_Int32 DatabaseMetaData::getDriverMajorVersion( ) throw (RuntimeException) +sal_Int32 DatabaseMetaData::getDriverMajorVersion( ) throw (RuntimeException, std::exception) { return PQ_SDBC_MAJOR; } -sal_Int32 DatabaseMetaData::getDriverMinorVersion( ) throw (RuntimeException) +sal_Int32 DatabaseMetaData::getDriverMinorVersion( ) throw (RuntimeException, std::exception) { return PQ_SDBC_MINOR; } -sal_Bool DatabaseMetaData::usesLocalFiles( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::usesLocalFiles( ) throw (SQLException, RuntimeException, std::exception) { // LEM TODO: // http://wiki.openoffice.org/wiki/Documentation/DevGuide/Database/XDatabaseMetaData_Interface @@ -235,62 +235,62 @@ sal_Bool DatabaseMetaData::usesLocalFiles( ) throw (SQLException, RuntimeExcept return sal_False; } -sal_Bool DatabaseMetaData::usesLocalFilePerTable( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::usesLocalFilePerTable( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::storesUpperCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::storesLowerCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::storesMixedCaseIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -OUString DatabaseMetaData::getIdentifierQuoteString( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getIdentifierQuoteString( ) throw (SQLException, RuntimeException, std::exception) { return OUString("\""); } -OUString DatabaseMetaData::getSQLKeywords( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getSQLKeywords( ) throw (SQLException, RuntimeException, std::exception) { // 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 @@ -325,7 +325,7 @@ OUString DatabaseMetaData::getSQLKeywords( ) throw (SQLException, RuntimeExcept "WINDOW" //SQL:2003 ); } -OUString DatabaseMetaData::getNumericFunctions( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getNumericFunctions( ) throw (SQLException, RuntimeException, std::exception) { // 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 @@ -366,7 +366,7 @@ OUString DatabaseMetaData::getNumericFunctions( ) throw (SQLException, RuntimeE ); } -OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeException, std::exception) { // See http://www.postgresql.org/docs/9.1/static/functions-string.html return OUString( @@ -420,7 +420,7 @@ OUString DatabaseMetaData::getStringFunctions( ) throw (SQLException, RuntimeEx ); } -OUString DatabaseMetaData::getSystemFunctions( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getSystemFunctions( ) throw (SQLException, RuntimeException, std::exception) { // See http://www.postgresql.org/docs/9.1/static/functions-info.html // and http://www.postgresql.org/docs/9.1/static/functions-admin.html @@ -549,7 +549,7 @@ OUString DatabaseMetaData::getSystemFunctions( ) throw (SQLException, RuntimeEx "pg_sleep" ); } -OUString DatabaseMetaData::getTimeDateFunctions( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getTimeDateFunctions( ) throw (SQLException, RuntimeException, std::exception) { // TODO return OUString( @@ -578,112 +578,112 @@ OUString DatabaseMetaData::getTimeDateFunctions( ) throw (SQLException, Runtime "transaction_timestamp," ); } -OUString DatabaseMetaData::getSearchStringEscape( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getSearchStringEscape( ) throw (SQLException, RuntimeException, std::exception) { return OUString("\\"); } -OUString DatabaseMetaData::getExtraNameCharacters( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getExtraNameCharacters( ) throw (SQLException, RuntimeException, std::exception) { return OUString("$"); } -sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsAlterTableWithAddColumn( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsAlterTableWithDropColumn( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsColumnAliasing( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsColumnAliasing( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::nullPlusNonNullIsNull( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::nullPlusNonNullIsNull( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsTypeConversion( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsTypeConversion( ) throw (SQLException, RuntimeException, std::exception) { // 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 sal_False; } -sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (SQLException, RuntimeException, std::exception) { (void) fromType; (void) toType; return sal_False; } -sal_Bool DatabaseMetaData::supportsTableCorrelationNames( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsTableCorrelationNames( ) throw (SQLException, RuntimeException, std::exception) { // LEM: A correlation name is "bar" in "SELECT foo FROM qux [AS] bar WHERE ..." return sal_True; } -sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsExpressionsInOrderBy( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsOrderByUnrelated( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsOrderByUnrelated( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsGroupBy( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsGroupBy( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsGroupByUnrelated( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsGroupByUnrelated( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsGroupByBeyondSelect( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsLikeEscapeClause( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsLikeEscapeClause( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsMultipleResultSets( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsMultipleResultSets( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsMultipleTransactions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsMultipleTransactions( ) throw (SQLException, RuntimeException, std::exception) { // Allows multiple transactions open at once (on different connections!) return sal_True; } -sal_Bool DatabaseMetaData::supportsNonNullableColumns( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsNonNullableColumns( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) { // LEM: jdbc driver says not, although the comments in it seem old // fdo#45249 Base query design won't use any aggregate function @@ -694,123 +694,123 @@ sal_Bool DatabaseMetaData::supportsCoreSQLGrammar( ) throw (SQLException, Runti return sal_True; } -sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw (SQLException, RuntimeException, std::exception) { // LEM: jdbc driver says not, although the comments in it seem old return sal_False; } -sal_Bool DatabaseMetaData::supportsANSI92FullSQL( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsANSI92FullSQL( ) throw (SQLException, RuntimeException, std::exception) { // LEM: jdbc driver says not, although the comments in it seem old return sal_False; } -sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw (SQLException, RuntimeException, std::exception) { // LEM: jdbc driver says yes, although comment says they are not sure what this means... return sal_True; } -sal_Bool DatabaseMetaData::supportsOuterJoins( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsOuterJoins( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsFullOuterJoins( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsFullOuterJoins( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsLimitedOuterJoins( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsLimitedOuterJoins( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -OUString DatabaseMetaData::getSchemaTerm( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getSchemaTerm( ) throw (SQLException, RuntimeException, std::exception) { return OUString("SCHEMA"); } -OUString DatabaseMetaData::getProcedureTerm( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getProcedureTerm( ) throw (SQLException, RuntimeException, std::exception) { return OUString("function"); } -OUString DatabaseMetaData::getCatalogTerm( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getCatalogTerm( ) throw (SQLException, RuntimeException, std::exception) { return OUString("DATABASE"); } -sal_Bool DatabaseMetaData::isCatalogAtStart( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::isCatalogAtStart( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -OUString DatabaseMetaData::getCatalogSeparator( ) throw (SQLException, RuntimeException) +OUString DatabaseMetaData::getCatalogSeparator( ) throw (SQLException, RuntimeException, std::exception) { return OUString("."); } -sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSchemasInDataManipulation( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSchemasInTableDefinitions( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsCatalogsInDataManipulation( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } @@ -820,91 +820,91 @@ 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) +sal_Bool DatabaseMetaData::supportsPositionedDelete( ) throw (SQLException, RuntimeException, std::exception) { // LEM: jdbc driver says not, although the comments in it seem old return sal_False; } -sal_Bool DatabaseMetaData::supportsPositionedUpdate( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsPositionedUpdate( ) throw (SQLException, RuntimeException, std::exception) { // LEM: jdbc driver says not, although the comments in it seem old return sal_False; } -sal_Bool DatabaseMetaData::supportsSelectForUpdate( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSelectForUpdate( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsStoredProcedures( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsStoredProcedures( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSubqueriesInComparisons( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSubqueriesInExists( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSubqueriesInExists( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSubqueriesInIns( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSubqueriesInIns( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw (SQLException, RuntimeException, std::exception) { // LEM: jdbc driver says yes, although comment says they don't know what this means... return sal_True; } -sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsCorrelatedSubqueries( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsUnion( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsUnion( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsUnionAll( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsUnionAll( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxBinaryLiteralLength( ) throw (SQLException, RuntimeException, std::exception) { return 0; } -sal_Int32 DatabaseMetaData::getMaxCharLiteralLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxCharLiteralLength( ) throw (SQLException, RuntimeException, std::exception) { return 0; } @@ -943,69 +943,69 @@ sal_Int32 DatabaseMetaData::getMaxIndexKeys() return m_pSettings->maxIndexKeys; } -sal_Int32 DatabaseMetaData::getMaxColumnNameLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxColumnNameLength( ) throw (SQLException, RuntimeException, std::exception) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxColumnsInGroupBy( ) throw (SQLException, RuntimeException, std::exception) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInIndex( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxColumnsInIndex( ) throw (SQLException, RuntimeException, std::exception) { return getMaxIndexKeys(); } -sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxColumnsInOrderBy( ) throw (SQLException, RuntimeException, std::exception) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInSelect( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxColumnsInSelect( ) throw (SQLException, RuntimeException, std::exception) { return 0; } -sal_Int32 DatabaseMetaData::getMaxColumnsInTable( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxColumnsInTable( ) throw (SQLException, RuntimeException, std::exception) { return 1600; } -sal_Int32 DatabaseMetaData::getMaxConnections( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxConnections( ) throw (SQLException, RuntimeException, std::exception) { // 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) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxCursorNameLength( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxIndexLength( ) throw (SQLException, RuntimeException) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxIndexLength( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know { // LEM: that's the index itself, not its name return 0; } -sal_Int32 DatabaseMetaData::getMaxSchemaNameLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxSchemaNameLength( ) throw (SQLException, RuntimeException, std::exception) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxProcedureNameLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxProcedureNameLength( ) throw (SQLException, RuntimeException, std::exception) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxCatalogNameLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxCatalogNameLength( ) throw (SQLException, RuntimeException, std::exception) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeException, std::exception) { // jdbc driver says 1GB, but http://www.postgresql.org/about/ says 1.6TB // and that 1GB is the maximum _field_ size @@ -1013,14 +1013,14 @@ sal_Int32 DatabaseMetaData::getMaxRowSize( ) throw (SQLException, RuntimeExcept return 0; } -sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw (SQLException, RuntimeException, std::exception) { // LEM: Err... PostgreSQL basically does not do BLOBs well // In any case, BLOBs do not change the maximal row length AFAIK return sal_True; } -sal_Int32 DatabaseMetaData::getMaxStatementLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxStatementLength( ) throw (SQLException, RuntimeException, std::exception) { // 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 @@ -1028,37 +1028,37 @@ sal_Int32 DatabaseMetaData::getMaxStatementLength( ) throw (SQLException, Runti return 0; } -sal_Int32 DatabaseMetaData::getMaxStatements( ) throw (SQLException, RuntimeException) //TODO, don't know +sal_Int32 DatabaseMetaData::getMaxStatements( ) throw (SQLException, RuntimeException, std::exception) //TODO, don't know { return 0; } -sal_Int32 DatabaseMetaData::getMaxTableNameLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxTableNameLength( ) throw (SQLException, RuntimeException, std::exception) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getMaxTablesInSelect( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxTablesInSelect( ) throw (SQLException, RuntimeException, std::exception) { return 0; } -sal_Int32 DatabaseMetaData::getMaxUserNameLength( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getMaxUserNameLength( ) throw (SQLException, RuntimeException, std::exception) { return getMaxNameLength(); } -sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation( ) throw (SQLException, RuntimeException) +sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation( ) throw (SQLException, RuntimeException, std::exception) { return com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED; } -sal_Bool DatabaseMetaData::supportsTransactions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsTransactions( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw (SQLException, RuntimeException, std::exception) { if ( level == com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED || level == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE @@ -1070,22 +1070,22 @@ sal_Bool DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) } sal_Bool DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } @@ -1093,7 +1093,7 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw (SQLException, RuntimeException) + const OUString& procedureNamePattern ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) schemaPattern; (void) procedureNamePattern; // 1. PROCEDURE_CAT string => procedure catalog (may be NULL ) @@ -1120,7 +1120,7 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException) + const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) schemaPattern; (void) procedureNamePattern; (void) columnNamePattern; MutexGuard guard( m_refMutex->mutex ); @@ -1136,7 +1136,7 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) types; Statics &statics = getStatics(); @@ -1257,7 +1257,7 @@ struct SortInternalSchemasLastAndPublicFirst }; ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getSchemas( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -1293,7 +1293,7 @@ struct SortInternalSchemasLastAndPublicFirst } ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // LEM TODO: return the current catalog like JDBC driver? // at least fake the columns, even if no content @@ -1304,7 +1304,7 @@ struct SortInternalSchemasLastAndPublicFirst } ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTableTypes( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // LEM TODO: this can be made dynamic, see JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -1465,7 +1465,7 @@ static void columnMetaData2DatabaseTypeDescription( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException) + const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; // LEM TODO: review in comparison with JDBC driver @@ -1652,7 +1652,7 @@ static void columnMetaData2DatabaseTypeDescription( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, - const OUString& columnNamePattern ) throw (SQLException, RuntimeException) + const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; @@ -1684,7 +1684,7 @@ static void columnMetaData2DatabaseTypeDescription( ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, - const OUString& tableNamePattern ) throw (SQLException, RuntimeException) + const OUString& tableNamePattern ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; MutexGuard guard( m_refMutex->mutex ); @@ -1714,7 +1714,7 @@ static void columnMetaData2DatabaseTypeDescription( const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) throw (SQLException, RuntimeException) + sal_Bool nullable ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) schema; (void) table; (void) scope; (void) nullable; //LEM TODO: implement! See JDBC driver @@ -1727,7 +1727,7 @@ static void columnMetaData2DatabaseTypeDescription( ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException) + const OUString& table ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) schema; (void) table; //LEM TODO: implement! See JDBC driver @@ -1740,7 +1740,7 @@ static void columnMetaData2DatabaseTypeDescription( ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException) + const OUString& table ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; //LEM TODO: review @@ -2127,7 +2127,7 @@ void DatabaseMetaData::init_getPrivs_stmt () ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException) + const OUString& table ) throw (SQLException, RuntimeException, std::exception) { return getImportedExportedKeys(Any(), OUString(), OUString(), catalog, schema, table); } @@ -2135,7 +2135,7 @@ void DatabaseMetaData::init_getPrivs_stmt () ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, - const OUString& table ) throw (SQLException, RuntimeException) + const OUString& table ) throw (SQLException, RuntimeException, std::exception) { return getImportedExportedKeys(catalog, schema, table, Any(), OUString(), OUString()); } @@ -2146,7 +2146,7 @@ void DatabaseMetaData::init_getPrivs_stmt () const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, - const OUString& foreignTable ) throw (SQLException, RuntimeException) + const OUString& foreignTable ) throw (SQLException, RuntimeException, std::exception) { return getImportedExportedKeys( primaryCatalog, primarySchema, primaryTable, foreignCatalog, foreignSchema, foreignTable ); } @@ -2316,7 +2316,7 @@ static void pgTypeInfo2ResultSet( ::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTypeInfo( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // Note: Indexes start at 0 (in the API doc, they start at 1) MutexGuard guard( m_refMutex->mutex ); @@ -2384,7 +2384,7 @@ static sal_Int32 seqContains( const Sequence< sal_Int32 > &seq, sal_Int32 value const OUString& schema, const OUString& table, sal_Bool unique, - sal_Bool approximate ) throw (SQLException, RuntimeException) + sal_Bool approximate ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) approximate; //LEM TODO: review @@ -2508,7 +2508,7 @@ static sal_Int32 seqContains( const Sequence< sal_Int32 > &seq, sal_Int32 value } sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { if ( setType == com::sun::star::sdbc::ResultSetType::SCROLL_SENSITIVE ) return sal_False; @@ -2517,7 +2517,7 @@ sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) } sal_Bool DatabaseMetaData::supportsResultSetConcurrency( - sal_Int32 setType, sal_Int32 concurrency ) throw (SQLException, RuntimeException) + sal_Int32 setType, sal_Int32 concurrency ) throw (SQLException, RuntimeException, std::exception) { (void) concurrency; if ( ! supportsResultSetType( setType ) ) @@ -2526,56 +2526,56 @@ sal_Bool DatabaseMetaData::supportsResultSetConcurrency( return sal_True; } -sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::ownDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::ownInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::othersDeletesAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::othersInsertsAreVisible( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::updatesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::deletesAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::insertsAreDetected( sal_Int32 /* setType */ ) throw (SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool DatabaseMetaData::supportsBatchUpdates( ) throw (SQLException, RuntimeException) +sal_Bool DatabaseMetaData::supportsBatchUpdates( ) throw (SQLException, RuntimeException, std::exception) { return sal_True; } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw (SQLException, RuntimeException) +::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) schemaPattern; (void) typeNamePattern; (void) types; //LEM TODO: implement! See JDBC driver @@ -2586,7 +2586,7 @@ sal_Bool DatabaseMetaData::supportsBatchUpdates( ) throw (SQLException, Runtime } ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > DatabaseMetaData::getConnection() - throw (SQLException, RuntimeException) + 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 749d2bb9f5dd..84ceafbc5661 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx @@ -76,155 +76,155 @@ public: public: // Methods - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSQLKeywords( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getNumericFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getStringFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSystemFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTimeDateFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSearchStringEscape( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getExtraNameCharacters( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProcedureTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogSeparator( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSQLKeywords( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getNumericFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStringFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSystemFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSearchStringEscape( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getProcedureTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogSeparator( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatements( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 0d0e015f3398..de99635038e2 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -101,7 +101,7 @@ Sequence< OUString > DriverGetSupportedServiceNames() Reference< XConnection > Driver::connect( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { if( ! acceptsURL( url ) ) // XDriver spec tells me to do so ... return Reference< XConnection > (); @@ -117,45 +117,45 @@ Reference< XConnection > Driver::connect( } sal_Bool Driver::acceptsURL( const OUString& url ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return url.startsWith( "sdbc:postgresql:" ); } Sequence< DriverPropertyInfo > Driver::getPropertyInfo( const OUString& url,const Sequence< PropertyValue >& info ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void)url; (void)info; return Sequence< DriverPropertyInfo > (); } -sal_Int32 Driver::getMajorVersion( ) throw (RuntimeException) +sal_Int32 Driver::getMajorVersion( ) throw (RuntimeException, std::exception) { return PQ_SDBC_MAJOR; } -sal_Int32 Driver::getMinorVersion( ) throw (RuntimeException) +sal_Int32 Driver::getMinorVersion( ) throw (RuntimeException, std::exception) { return PQ_SDBC_MINOR; } // XServiceInfo OUString SAL_CALL Driver::getImplementationName() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return DriverGetImplementationName(); } sal_Bool Driver::supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > Driver::getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return DriverGetSupportedServiceNames(); } @@ -169,14 +169,14 @@ void Driver::disposing() Reference< XTablesSupplier > Driver::getDataDefinitionByConnection( const Reference< XConnection >& connection ) - throw (SQLException, RuntimeException) + 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) + throw (SQLException, RuntimeException, std::exception) { return Reference< XTablesSupplier > ( connect( url, info ), UNO_QUERY ); } @@ -212,20 +212,20 @@ public: // XSingleComponentFactory virtual Reference< XInterface > SAL_CALL createInstanceWithContext( Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException); + throw (Exception, RuntimeException, std::exception); virtual Reference< XInterface > SAL_CALL createInstanceWithArgumentsAndContext( Sequence< Any > const & rArguments, Reference< XComponentContext > const & xContext ) - throw (Exception, RuntimeException); + throw (Exception, RuntimeException, std::exception); // XServiceInfo OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return m_implName; } sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { for( int i = 0 ; i < m_serviceNames.getLength() ; i ++ ) if( m_serviceNames[i] == ServiceName ) @@ -233,7 +233,7 @@ public: return sal_False; } Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return m_serviceNames; } @@ -251,7 +251,7 @@ private: Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgumentsAndContext( Sequence< Any > const &rArguments, const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception ) + throw( RuntimeException, Exception, std::exception ) { (void)rArguments; return createInstanceWithContext( ctx ); @@ -259,7 +259,7 @@ Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithArgument Reference< XInterface > OOneInstanceComponentFactory::createInstanceWithContext( const Reference< XComponentContext > & ctx ) - throw( RuntimeException, Exception ) + 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 3745e5d5af6e..8d2af7fbd907 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -84,39 +84,39 @@ public: // XDriver virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XServiceInfo // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDefinitionSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XComponent virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx index 6b288ea68196..eb2e5e2d63ff 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx @@ -74,7 +74,7 @@ FakedUpdateableResultSet::FakedUpdateableResultSet( com::sun::star::uno::Any FakedUpdateableResultSet::queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { Any ret = ResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -87,7 +87,7 @@ com::sun::star::uno::Any FakedUpdateableResultSet::queryInterface( com::sun::star::uno::Sequence< com::sun::star::uno::Type > FakedUpdateableResultSet::getTypes() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -107,7 +107,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > FakedUpdateableResult } com::sun::star::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementationId() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { static cppu::OImplementationId *pId; if( ! pId ) @@ -122,118 +122,118 @@ com::sun::star::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementa return pId->getImplementationId(); } -void FakedUpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateNull( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateBoolean( sal_Int32 /* columnIndex */, sal_Bool /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateByte( sal_Int32 /* columnIndex */, sal_Int8 /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateShort( sal_Int32 /* columnIndex */, sal_Int16 /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateInt( sal_Int32 /* columnIndex */, sal_Int32 /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateLong( sal_Int32 /* columnIndex */, sal_Int64 /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateFloat( sal_Int32 /* columnIndex */, float /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateDouble( sal_Int32 /* columnIndex */, double /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const OUString& /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Sequence< sal_Int8 >& /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Sequence< sal_Int8 >& /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const ::com::sun::star::util::Date& /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const ::com::sun::star::util::Date& /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const ::com::sun::star::util::Time& /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const ::com::sun::star::util::Time& /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const ::com::sun::star::util::DateTime& /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const ::com::sun::star::util::DateTime& /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception) { throw SQLException( m_aReason, *this, OUString(),1,Any() ); } -void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException) +void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception) { 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 a617186a2a1f..25fbc6e3d96a 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx @@ -69,40 +69,40 @@ public: // XInterface virtual void SAL_CALL release() throw() { ResultSet::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deleteRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancelRowUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToInsertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToCurrentRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deleteRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelRowUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToInsertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToCurrentRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index c43bfc3732d5..65ecdb4f2c0a 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -240,7 +240,7 @@ void PreparedStatement::checkClosed() throw (SQLException, RuntimeException ) *this, OUString(),1,Any()); } -Any PreparedStatement::queryInterface( const Type & reqType ) throw (RuntimeException) +Any PreparedStatement::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -260,7 +260,7 @@ Any PreparedStatement::queryInterface( const Type & reqType ) throw (RuntimeExce } -Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException ) +Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -285,7 +285,7 @@ Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeException, std::exception ) { static cppu::OImplementationId *pId; if( ! pId ) @@ -300,7 +300,7 @@ Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeExce return pId->getImplementationId(); } -void PreparedStatement::close( ) throw (SQLException, RuntimeException) +void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::exception) { // let the connection die without acquired mutex ! Reference< XConnection > r; @@ -343,7 +343,7 @@ void PreparedStatement::raiseSQLException( } Reference< XResultSet > PreparedStatement::executeQuery( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { Reference< XCloseable > lastResultSet = m_lastResultset; if( lastResultSet.is() ) @@ -357,7 +357,7 @@ Reference< XResultSet > PreparedStatement::executeQuery( ) } sal_Int32 PreparedStatement::executeUpdate( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { if( execute( ) ) { @@ -367,7 +367,7 @@ sal_Int32 PreparedStatement::executeUpdate( ) } sal_Bool PreparedStatement::execute( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -446,7 +446,7 @@ sal_Bool PreparedStatement::execute( ) } Reference< XConnection > PreparedStatement::getConnection( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > ret; { @@ -459,7 +459,7 @@ Reference< XConnection > PreparedStatement::getConnection( ) void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void)sqlType; MutexGuard guard( m_refMutex->mutex ); @@ -470,7 +470,7 @@ void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) void PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) sqlType; (void) typeName; MutexGuard guard( m_refMutex->mutex ); @@ -481,7 +481,7 @@ void PreparedStatement::setObjectNull( void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -493,19 +493,19 @@ void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) } void PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { setInt(parameterIndex,x); } void PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { setInt(parameterIndex, x ); } void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // printf( "setString %d %d\n ", parameterIndex, x); MutexGuard guard(m_refMutex->mutex ); @@ -519,7 +519,7 @@ void PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) } void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -532,7 +532,7 @@ void PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) } void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -545,7 +545,7 @@ void PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) } void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -558,7 +558,7 @@ void PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) } void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // printf( "setString %d %s\n ", parameterIndex, // OUStringToOString( x , RTL_TEXTENCODING_ASCII_US ).getStr()); @@ -577,7 +577,7 @@ void PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) void PreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); checkClosed(); @@ -601,20 +601,20 @@ void PreparedStatement::setBytes( void PreparedStatement::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateString( x ) ); } void PreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toTimeString( x ) ); } void PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateTimeString( x ) ); } @@ -623,7 +623,7 @@ void PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; (void) length; throw SQLException( @@ -635,7 +635,7 @@ void PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; (void) length; throw SQLException( @@ -644,7 +644,7 @@ void PreparedStatement::setCharacterStream( } void PreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { if( ! implSetObject( this, parameterIndex, x )) { @@ -660,7 +660,7 @@ void PreparedStatement::setObjectWithInfo( const Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) scale; if( com::sun::star::sdbc::DataType::DECIMAL == targetSqlType || @@ -700,7 +700,7 @@ void PreparedStatement::setObjectWithInfo( void PreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -711,7 +711,7 @@ void PreparedStatement::setRef( void PreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -722,7 +722,7 @@ void PreparedStatement::setBlob( void PreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void)x; throw SQLException( @@ -733,31 +733,31 @@ void PreparedStatement::setClob( void PreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, array2String( x->getArray( 0 ) ) ); } void PreparedStatement::clearParameters( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard(m_refMutex->mutex ); m_vars = OStringVector ( m_vars.size() ); } Any PreparedStatement::getWarnings( ) - throw (SQLException,RuntimeException) + throw (SQLException,RuntimeException, std::exception) { return Any(); } void PreparedStatement::clearWarnings( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { } Reference< ::com::sun::star::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() - throw (SQLException,RuntimeException) + throw (SQLException,RuntimeException, std::exception) { Reference< com::sun::star::sdbc::XResultSetMetaData > ret; Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); @@ -821,7 +821,7 @@ sal_Bool PreparedStatement::convertFastPropertyValue( void PreparedStatement::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception) + sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) { m_props[nHandle] = rValue; } @@ -832,7 +832,7 @@ void PreparedStatement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) c } Reference < XPropertySetInfo > PreparedStatement::getPropertySetInfo() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getPreparedStatementPropertyArrayHelper() ); } @@ -844,23 +844,23 @@ void PreparedStatement::disposing() Reference< XResultSet > PreparedStatement::getResultSet( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XResultSet > ( m_lastResultset, com::sun::star::uno::UNO_QUERY ); } sal_Int32 PreparedStatement::getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool PreparedStatement::getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return sal_False; } Reference< XResultSet > PreparedStatement::getGeneratedValues( ) - throw (SQLException, RuntimeException) + 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 a92dd64a54eb..ad7f897128be 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx @@ -105,101 +105,101 @@ public: // XInterface virtual void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XPreparedStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL executeUpdate( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL execute( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearParameters( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -214,7 +214,7 @@ public: // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -224,25 +224,25 @@ public: // OPropertySetHelper // XPropertySet ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); public: // XGeneratedResultSet virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getGeneratedValues( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XMultipleResults virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XResultSetMetaDataSupplier (is required by framework (see // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() ) virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index 9b70207c1412..2000eb6da1e7 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -131,7 +131,7 @@ Any ResultSet::getValue( sal_Int32 columnIndex ) ResultSet::~ResultSet() {} -void ResultSet::close( ) throw (SQLException, RuntimeException) +void ResultSet::close( ) throw (SQLException, RuntimeException, std::exception) { Reference< XInterface > owner; { @@ -147,7 +147,7 @@ void ResultSet::close( ) throw (SQLException, RuntimeException) } } -Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, RuntimeException) +Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -156,7 +156,7 @@ Reference< XResultSetMetaData > ResultSet::getMetaData( ) throw (SQLException, } sal_Int32 ResultSet::findColumn( const OUString& columnName ) - throw (SQLException, RuntimeException) + 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 07f178f69ccc..9097b1d47d4f 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx @@ -80,15 +80,15 @@ public: public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XResultSetMetaDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); 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 f519dad53237..f041721117bf 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -284,13 +284,13 @@ Reference< com::sun::star::beans::XPropertySet > ResultSetMetaData::getColumnByI // Methods sal_Int32 ResultSetMetaData::getColumnCount( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return m_colCount; } sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { sal_Bool ret = getBoolColumnProperty( getStatics().IS_AUTO_INCREMENT, column, sal_False ); @@ -298,39 +298,39 @@ sal_Bool ResultSetMetaData::isAutoIncrement( sal_Int32 column ) } sal_Bool ResultSetMetaData::isCaseSensitive( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) column; return sal_True; // ??? hmm, numeric types or } -sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) throw (SQLException, RuntimeException) +sal_Bool ResultSetMetaData::isSearchable( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { (void) column; return sal_True; // mmm, what types are not searchable ? } -sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException) +sal_Bool ResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { return getBoolColumnProperty( getStatics().IS_CURRENCY, column, sal_False ); } sal_Int32 ResultSetMetaData::isNullable( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return getIntColumnProperty( getStatics().IS_NULLABLE, column, com::sun::star::sdbc::ColumnValue::NULLABLE_UNKNOWN ); } sal_Bool ResultSetMetaData::isSigned( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) column; return sal_True; } sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -339,12 +339,12 @@ sal_Int32 ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) } OUString ResultSetMetaData::getColumnLabel( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return getColumnName( column); } -OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -353,14 +353,14 @@ OUString ResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLExceptio return m_colDesc[column-1].name; } -OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString ResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { (void) column; return m_schemaName; } sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -369,7 +369,7 @@ sal_Int32 ResultSetMetaData::getPrecision( sal_Int32 column ) } sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -378,7 +378,7 @@ sal_Int32 ResultSetMetaData::getScale( sal_Int32 column ) } OUString ResultSetMetaData::getTableName( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) column; // LEM TODO This is very fishy.. Should probably return the table to which that column belongs! @@ -386,14 +386,14 @@ OUString ResultSetMetaData::getTableName( sal_Int32 column ) } OUString ResultSetMetaData::getCatalogName( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) column; // can do this through XConnection.getCatalog() ! return OUString(); } sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { int ret = getIntColumnProperty( getStatics().TYPE, column, -100 ); if( -100 == ret ) @@ -407,7 +407,7 @@ sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) } OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { OUString ret; // give defensive answers, when data is not available try @@ -434,25 +434,25 @@ OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) sal_Bool ResultSetMetaData::isReadOnly( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) column; return sal_False; } sal_Bool ResultSetMetaData::isWritable( sal_Int32 column ) - throw (SQLException, RuntimeException) + 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) + throw (SQLException, RuntimeException, std::exception) { return isWritable(column); // uhh, now it becomes really esoteric .... } OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { (void) column; return OUString(); diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx index 41cf95d6e055..1fb46c3d42a6 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx @@ -104,27 +104,27 @@ public: public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColumnCount( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index d3588529500a..73a2647dd30f 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -86,13 +86,13 @@ SequenceResultSet::~SequenceResultSet() } void SequenceResultSet::close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { // a noop } Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_meta.is() ) { @@ -110,7 +110,7 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) sal_Int32 SAL_CALL SequenceResultSet::findColumn( const OUString& columnName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::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 23cb9881ab06..f33069f907c2 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx @@ -81,15 +81,15 @@ public: public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XResultSetMetaDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index 8e6f9a8301dd..eb67bbf83b03 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -60,69 +60,69 @@ SequenceResultSetMetaData::SequenceResultSetMetaData( // Methods sal_Int32 SequenceResultSetMetaData::getColumnCount( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return m_colCount; } sal_Bool SequenceResultSetMetaData::isAutoIncrement( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].isAutoIncrement; } sal_Bool SequenceResultSetMetaData::isCaseSensitive( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return sal_True; // ??? hmm, numeric types or } -sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ ) throw (SQLException, RuntimeException) +sal_Bool SequenceResultSetMetaData::isSearchable( sal_Int32 /* column */ ) throw (SQLException, RuntimeException, std::exception) { return sal_True; // mmm, what types are not searchable ? } -sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException) +sal_Bool SequenceResultSetMetaData::isCurrency( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].isCurrency; } sal_Int32 SequenceResultSetMetaData::isNullable( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].isNullable; } sal_Bool SequenceResultSetMetaData::isSigned( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return sal_True; } sal_Int32 SequenceResultSetMetaData::getColumnDisplaySize( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return 50; } OUString SequenceResultSetMetaData::getColumnLabel( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString SequenceResultSetMetaData::getColumnName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].columnName; } -OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException) +OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].schemaTableName; @@ -131,41 +131,41 @@ OUString SequenceResultSetMetaData::getSchemaName( sal_Int32 column ) throw (SQL sal_Int32 SequenceResultSetMetaData::getPrecision( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].precision; } sal_Int32 SequenceResultSetMetaData::getScale( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].scale; } OUString SequenceResultSetMetaData::getTableName( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].tableName; } OUString SequenceResultSetMetaData::getCatalogName( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { // can do this through XConnection.getCatalog() ! return OUString(); } sal_Int32 SequenceResultSetMetaData::getColumnType( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].type; } OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { checkColumnIndex( column ); return m_columnData[column-1].typeName; @@ -173,24 +173,24 @@ OUString SequenceResultSetMetaData::getColumnTypeName( sal_Int32 column ) sal_Bool SequenceResultSetMetaData::isReadOnly( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SequenceResultSetMetaData::isWritable( sal_Int32 column ) - throw (SQLException, RuntimeException) + 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) + throw (SQLException, RuntimeException, std::exception) { return isWritable(column); // uhh, now it becomes really esoteric .... } OUString SequenceResultSetMetaData::getColumnServiceName( sal_Int32 /* column */ ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { return OUString(); } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx index f1f535e12f84..f7709b68301b 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx @@ -63,27 +63,27 @@ namespace pq_sdbc_driver public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColumnCount( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 4a9a8c8ce5a1..d997bb8ceb60 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -187,7 +187,7 @@ void Statement::checkClosed() throw (SQLException, RuntimeException ) *this, OUString(),1,Any()); } -Any Statement::queryInterface( const Type & reqType ) throw (RuntimeException) +Any Statement::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -206,7 +206,7 @@ Any Statement::queryInterface( const Type & reqType ) throw (RuntimeException) } -Sequence< Type > Statement::getTypes() throw ( RuntimeException ) +Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -230,7 +230,7 @@ Sequence< Type > Statement::getTypes() throw ( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException ) +Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException, std::exception ) { static cppu::OImplementationId *pId; if( ! pId ) @@ -245,7 +245,7 @@ Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException ) return pId->getImplementationId(); } -void Statement::close( ) throw (SQLException, RuntimeException) +void Statement::close( ) throw (SQLException, RuntimeException, std::exception) { // let the connection die without acquired mutex ! Reference< XConnection > r; @@ -290,7 +290,7 @@ void Statement::raiseSQLException( } Reference< XResultSet > Statement::executeQuery(const OUString& sql ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { Reference< XCloseable > lastResultSetHolder = m_lastResultset; if( lastResultSetHolder.is() ) @@ -304,7 +304,7 @@ Reference< XResultSet > Statement::executeQuery(const OUString& sql ) } sal_Int32 Statement::executeUpdate( const OUString& sql ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { if( execute( sql ) ) { @@ -861,7 +861,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( } sal_Bool Statement::execute( const OUString& sql ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -887,7 +887,7 @@ sal_Bool Statement::execute( const OUString& sql ) } Reference< XConnection > Statement::getConnection( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > ret; { @@ -900,18 +900,18 @@ Reference< XConnection > Statement::getConnection( ) Any Statement::getWarnings( ) - throw (SQLException,RuntimeException) + throw (SQLException,RuntimeException, std::exception) { return Any(); } void Statement::clearWarnings( ) - throw (SQLException, RuntimeException) + throw (SQLException, RuntimeException, std::exception) { } Reference< ::com::sun::star::sdbc::XResultSetMetaData > Statement::getMetaData() - throw (SQLException,RuntimeException) + throw (SQLException,RuntimeException, std::exception) { Reference< com::sun::star::sdbc::XResultSetMetaData > ret; Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); @@ -976,7 +976,7 @@ sal_Bool Statement::convertFastPropertyValue( void Statement::setFastPropertyValue_NoBroadcast( - sal_Int32 nHandle,const Any& rValue ) throw (Exception) + sal_Int32 nHandle,const Any& rValue ) throw (Exception, std::exception) { m_props[nHandle] = rValue; } @@ -987,26 +987,26 @@ void Statement::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } Reference < XPropertySetInfo > Statement::getPropertySetInfo() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( getStatementPropertyArrayHelper() ); } Reference< XResultSet > Statement::getResultSet( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return Reference< XResultSet > ( m_lastResultset, com::sun::star::uno::UNO_QUERY ); } sal_Int32 Statement::getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool Statement::getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return sal_False; } @@ -1019,7 +1019,7 @@ void Statement::disposing() } Reference< XResultSet > Statement::getGeneratedValues( ) - throw (SQLException, RuntimeException) + 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 dee170b7dad7..e647a52088dd 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.hxx +++ b/connectivity/source/drivers/postgresql/pq_statement.hxx @@ -96,34 +96,34 @@ public: // XInterface virtual void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL execute( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -138,7 +138,7 @@ public: // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -148,20 +148,20 @@ public: // OPropertySetHelper // XPropertySet ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); public: // XGeneratedResultSet virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getGeneratedValues( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XMultipleResults virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // OComponentHelper virtual void SAL_CALL disposing(); @@ -169,7 +169,7 @@ public: // OComponentHelper public: // XResultSetMetaDataSupplier (is required by framework (see // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() ) virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); private: void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index b3b738449f0d..490f0a16784c 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -135,7 +135,7 @@ com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > UpdateableRes com::sun::star::uno::Any UpdateableResultSet::queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { Any ret = SequenceResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -148,7 +148,7 @@ com::sun::star::uno::Any UpdateableResultSet::queryInterface( com::sun::star::uno::Sequence< com::sun::star::uno::Type > UpdateableResultSet::getTypes() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -168,7 +168,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > UpdateableResultSet:: } com::sun::star::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationId() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { static cppu::OImplementationId *pId; if( ! pId ) @@ -205,7 +205,7 @@ OUString UpdateableResultSet::buildWhereClause() } -void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException) +void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); if( isLog( *m_ppSettings, LogLevel::INFO ) ) @@ -299,7 +299,7 @@ void UpdateableResultSet::insertRow( ) throw (SQLException, RuntimeException) m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); if( isLog( *m_ppSettings, LogLevel::INFO ) ) @@ -349,7 +349,7 @@ void UpdateableResultSet::updateRow( ) throw (SQLException, RuntimeException) m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException) +void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException, std::exception) { if( isLog( *m_ppSettings, LogLevel::INFO ) ) { @@ -388,18 +388,18 @@ void UpdateableResultSet::deleteRow( ) throw (SQLException, RuntimeException) m_data.realloc( m_rowCount ); } -void UpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException) +void UpdateableResultSet::cancelRowUpdates( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); m_updateableField = UpdateableFieldVector(); } -void UpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException) +void UpdateableResultSet::moveToInsertRow( ) throw (SQLException, RuntimeException, std::exception) { m_insertRow = true; } -void UpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException) +void UpdateableResultSet::moveToCurrentRow( ) throw (SQLException, RuntimeException, std::exception) { m_insertRow = false; } @@ -412,7 +412,7 @@ void UpdateableResultSet::checkUpdate( sal_Int32 columnIndex) m_updateableField[columnIndex-1].isTouched = true; } -void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateNull( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -420,7 +420,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) +void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -431,17 +431,17 @@ void UpdateableResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) thr } -void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (SQLException, RuntimeException, std::exception) { updateInt(columnIndex,x); } -void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (SQLException, RuntimeException, std::exception) { updateInt( columnIndex, x ); } -void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (SQLException, RuntimeException, std::exception) { updateLong( columnIndex, x ); // MutexGuard guard( m_refMutex->mutex ); @@ -452,7 +452,7 @@ void UpdateableResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw } -void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -465,7 +465,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) +void UpdateableResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -475,7 +475,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) +void UpdateableResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -484,7 +484,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) +void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -493,7 +493,7 @@ void UpdateableResultSet::updateString( sal_Int32 columnIndex, const OUString& x m_updateableField[columnIndex-1].value <<= x; } -void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -515,40 +515,40 @@ void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun:: free( escapedString ); } -void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (SQLException, RuntimeException, std::exception) { updateString( columnIndex, DBTypeConversion::toDateString( x ) ); } -void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (SQLException, RuntimeException, std::exception) { updateString( columnIndex, DBTypeConversion::toTimeString( x ) ); } -void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw (SQLException, RuntimeException, std::exception) { updateString( columnIndex, DBTypeConversion::toDateTimeString( x ) ); } -void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) { } -void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) { } -void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */ ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */ ) throw (SQLException, RuntimeException, std::exception) { } -void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException) +void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const ::com::sun::star::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception) { } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > UpdateableResultSet::getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_meta; } diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index 83e4d8dd0652..90345e328c1d 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -126,44 +126,44 @@ public: // XInterface virtual void SAL_CALL release() throw() { SequenceResultSet::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deleteRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancelRowUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToInsertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToCurrentRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deleteRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelRowUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToInsertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToCurrentRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XResultSetMetaDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); static com::sun::star::uno::Sequence< com::sun::star::uno::Type > getStaticTypes( bool updateable ) diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index 6eb1460dd19c..14b458b15389 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -113,7 +113,7 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public( void ReflectionBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception) + throw (::com::sun::star::uno::Exception, std::exception) { // OUString s; // rValue >>= s; @@ -135,32 +135,32 @@ void ReflectionBase::getFastPropertyValue( } Reference < ::com::sun::star::beans::XPropertySetInfo > ReflectionBase::getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( m_propsDesc ); } OUString ReflectionBase::getImplementationName() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return m_implName; } sal_Bool ReflectionBase::supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > ReflectionBase::getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return m_supportedServices; } Sequence< com::sun::star::uno::Type > ReflectionBase::getTypes() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { osl::MutexGuard guard( m_refMutex->mutex ); static cppu::OTypeCollection collection( @@ -177,7 +177,7 @@ Sequence< com::sun::star::uno::Type > ReflectionBase::getTypes() com::sun::star::uno::Any ReflectionBase::queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { Any ret; ret = OComponentHelper::queryInterface( reqType ); @@ -194,7 +194,7 @@ com::sun::star::uno::Any ReflectionBase::queryInterface( } -Sequence< sal_Int8> ReflectionBase::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> ReflectionBase::getImplementationId() throw( RuntimeException, std::exception ) { static cppu::OImplementationId *pId; if( ! pId ) @@ -226,7 +226,7 @@ void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set ) } } -OUString ReflectionBase::getName( ) throw (::com::sun::star::uno::RuntimeException) +OUString ReflectionBase::getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { Statics & st = getStatics(); if( getInfoHelper().hasPropertyByName( st.SCHEMA_NAME ) ) @@ -239,7 +239,7 @@ OUString ReflectionBase::getName( ) throw (::com::sun::star::uno::RuntimeExcept void ReflectionBase::setName( const OUString& /* aName */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { throw RuntimeException( OUString( "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 bfbdf4a85318..ccc1a597c184 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -83,7 +83,7 @@ public: //XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -98,7 +98,7 @@ public: // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -108,29 +108,29 @@ public: // OPropertySetHelper // XPropertySet ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException) = 0; + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; public: // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index dd0f4ac3474e..7a3e053814b9 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -60,7 +60,7 @@ Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.column.pProps ) {} -Reference< XPropertySet > Column::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > Column::createDataDescriptor( ) throw (RuntimeException, std::exception) { ColumnDescriptor * pColumn = new ColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -81,7 +81,7 @@ ColumnDescriptor::ColumnDescriptor( *getStatics().refl.columnDescriptor.pProps ) {} -Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > ColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { 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 7efb7e11b8c3..e18711f2e014 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 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -72,7 +72,7 @@ public: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index 17120f36771b..90d9c6e485a3 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -285,7 +285,7 @@ OUString columnMetaData2SDBCX( // }; void Columns::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -475,7 +475,7 @@ void Columns::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& future ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); @@ -512,7 +512,7 @@ void Columns::appendByDescriptor( void Columns::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= m_values.getLength() ) @@ -547,7 +547,7 @@ void Columns::dropByIndex( sal_Int32 index ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Columns::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -579,7 +579,7 @@ ColumnDescriptors::ColumnDescriptors( Reference< ::com::sun::star::beans::XPropertySet > ColumnDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 75e88616bd8a..a73f0f47f11f 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx @@ -84,7 +84,7 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // public: // XDrop // virtual void SAL_CALL dropByName( const OUString& elementName ) @@ -94,14 +94,14 @@ public: // XAppend virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -115,7 +115,7 @@ public: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx index 816519c394ec..a020633c0c93 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx @@ -159,7 +159,7 @@ Container::Container( } Any Container::getByName( const OUString& aName ) - throw (NoSuchElementException,WrappedTargetException,RuntimeException) + throw (NoSuchElementException,WrappedTargetException,RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( aName ); if( ii == m_name2index.end() ) @@ -177,7 +177,7 @@ Any Container::getByName( const OUString& aName ) } Sequence< OUString > Container::getElementNames( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { Sequence< OUString > ret( m_values.getLength() ); for( String2IntMap::const_iterator ii = m_name2index.begin(); @@ -192,19 +192,19 @@ Sequence< OUString > Container::getElementNames( ) } sal_Bool Container::hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_name2index.find( aName ) != m_name2index.end(); } // Methods Type Container::getElementType( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return Type(); } sal_Bool Container::hasElements( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return ! m_name2index.empty(); } @@ -212,7 +212,7 @@ sal_Bool Container::hasElements( ) Any Container::getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { if( Index < 0 || Index >= m_values.getLength() ) { @@ -229,7 +229,7 @@ Any Container::getByIndex( sal_Int32 Index ) } sal_Int32 Container::getCount() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_values.getLength(); } @@ -248,16 +248,16 @@ public: public: // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); }; sal_Bool ContainerEnumeration::hasMoreElements() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_vec.getLength() > m_index +1; } @@ -265,7 +265,7 @@ sal_Bool ContainerEnumeration::hasMoreElements() com::sun::star::uno::Any ContainerEnumeration::nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { if( ! hasMoreElements() ) { @@ -277,21 +277,21 @@ com::sun::star::uno::Any ContainerEnumeration::nextElement() } Reference< XEnumeration > Container::createEnumeration( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return new ContainerEnumeration( m_values ); } void Container::addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { rBHelper.addListener( getCppuType(&l) , l ); } void Container::removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { rBHelper.removeListener( getCppuType(&l) , l ); } @@ -322,7 +322,7 @@ void Container::rename( const OUString &oldName, const OUString &newName ) void Container::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); String2IntMap::const_iterator ii = m_name2index.find( elementName ); @@ -347,7 +347,7 @@ void Container::dropByName( const OUString& elementName ) void Container::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= m_values.getLength() ) @@ -429,7 +429,7 @@ void Container::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { append( extractStringProperty( descriptor, getStatics().NAME ), descriptor ); } @@ -437,14 +437,14 @@ void Container::appendByDescriptor( void Container::addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { rBHelper.addListener( getCppuType(&l) , l ); } void Container::removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { rBHelper.removeListener( getCppuType(&l) , l ); } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index c52e346b3da6..b347fa3af047 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -127,30 +127,30 @@ public: public: // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > - SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException); + SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XAppend @@ -160,7 +160,7 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // helper method ! void append( @@ -173,33 +173,33 @@ public: // XDrop virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException) {} + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) {} virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); public: // Methods virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); public: virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 3788a4a3d0a1..5f6074db68b6 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -102,7 +102,7 @@ Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex, m_tableName( tableName ) {} -Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeException, std::exception) { IndexDescriptor * pIndex = new IndexDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -111,7 +111,7 @@ Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > Index::getColumns( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > Index::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_indexColumns.is() ) { @@ -125,7 +125,7 @@ Reference< XNameAccess > Index::getColumns( ) throw (::com::sun::star::uno::Run return m_indexColumns; } -Sequence<Type > Index::getTypes() throw( RuntimeException ) +Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -142,12 +142,12 @@ Sequence<Type > Index::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> Index::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> Index::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.index.implementationId; } -Any Index::queryInterface( const Type & reqType ) throw (RuntimeException) +Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -174,7 +174,7 @@ IndexDescriptor::IndexDescriptor( * getStatics().refl.indexDescriptor.pProps ) {} -Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { IndexDescriptor * pIndex = new IndexDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -182,7 +182,7 @@ Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (Runti return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_indexColumns.is() ) { @@ -198,7 +198,7 @@ Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (::com::sun::star return m_indexColumns; } -Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException ) +Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -215,12 +215,12 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> IndexDescriptor::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> IndexDescriptor::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.indexDescriptor.implementationId; } -Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException) +Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx index 0937a6e96ae5..09c791652595 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx @@ -71,21 +71,21 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException); + getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -106,21 +106,21 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException); + getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx index 3b23c2d0a6b8..4bbef7f93656 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx @@ -60,7 +60,7 @@ IndexColumn::IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.indexColumn.pProps ) {} -Reference< XPropertySet > IndexColumn::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > IndexColumn::createDataDescriptor( ) throw (RuntimeException, std::exception) { IndexColumnDescriptor * pIndexColumn = new IndexColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -83,7 +83,7 @@ IndexColumnDescriptor::IndexColumnDescriptor( * getStatics().refl.indexColumnDescriptor.pProps ) {} -Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > IndexColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { 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 b557b5e4ceab..b1a45210df26 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 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -73,7 +73,7 @@ public: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index 4cc2eb1971ab..accede94c50d 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -109,7 +109,7 @@ static sal_Int32 findInSequence( const Sequence< OUString > & seq , const OUStri } void IndexColumns::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -166,7 +166,7 @@ void IndexColumns::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*future*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { throw com::sun::star::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.appendByDescriptor not yet implemented", @@ -183,7 +183,7 @@ void IndexColumns::appendByDescriptor( void IndexColumns::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { (void) elementName; throw com::sun::star::sdbc::SQLException( @@ -209,7 +209,7 @@ void IndexColumns::dropByName( const OUString& elementName ) void IndexColumns::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { (void) index; throw com::sun::star::sdbc::SQLException( @@ -247,7 +247,7 @@ void IndexColumns::dropByIndex( sal_Int32 index ) Reference< ::com::sun::star::beans::XPropertySet > IndexColumns::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -286,7 +286,7 @@ Reference< com::sun::star::container::XNameAccess > IndexColumnDescriptors::crea } ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > IndexColumnDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 bc259a979aee..320003e8cbd7 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx @@ -76,24 +76,24 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDrop virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -114,7 +114,7 @@ protected: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index 7aa98928b98d..58ad44d5bca3 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -96,7 +96,7 @@ Indexes::~Indexes() {} void Indexes::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -200,7 +200,7 @@ void Indexes::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { Statics & st = getStatics(); OUString name = extractStringProperty( descriptor, st.NAME ); @@ -251,7 +251,7 @@ void Indexes::appendByDescriptor( void Indexes::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { @@ -282,7 +282,7 @@ void Indexes::dropByIndex( sal_Int32 index ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Indexes::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return new IndexDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -318,7 +318,7 @@ Reference< com::sun::star::container::XNameAccess > IndexDescriptors::create( } ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > IndexDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 d6b3a7921897..d9192742fda6 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx @@ -69,20 +69,20 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDrop virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -102,7 +102,7 @@ protected: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index 3d2c5f40def0..41f137d20f66 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -102,7 +102,7 @@ Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex, m_tableName( tableName ) {} -Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException, std::exception) { KeyDescriptor * pKeyDescriptor = new KeyDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -111,7 +111,7 @@ Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException) return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > Key::getColumns( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > Key::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -127,7 +127,7 @@ Reference< XNameAccess > Key::getColumns( ) throw (::com::sun::star::uno::Runti return m_keyColumns; } -Sequence<Type > Key::getTypes() throw( RuntimeException ) +Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -144,12 +144,12 @@ Sequence<Type > Key::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> Key::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> Key::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.key.implementationId; } -Any Key::queryInterface( const Type & reqType ) throw (RuntimeException) +Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -176,7 +176,7 @@ KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMut { } -Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { KeyDescriptor * pKeyDescriptor = new KeyDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -185,7 +185,7 @@ Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (Runtime return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -195,7 +195,7 @@ Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (::com::sun::star:: return m_keyColumns; } -Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException ) +Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -212,12 +212,12 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> KeyDescriptor::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> KeyDescriptor::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.keyDescriptor.implementationId; } -Any KeyDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException) +Any KeyDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx index 4c5cfe9e2131..c9f6f5d34a66 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx @@ -71,21 +71,21 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException); + getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -104,21 +104,21 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException); + getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx index 96b22de9fc52..df64d6ef40e8 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx @@ -60,7 +60,7 @@ KeyColumn::KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.keycolumn.pProps ) {} -Reference< XPropertySet > KeyColumn::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > KeyColumn::createDataDescriptor( ) throw (RuntimeException, std::exception) { KeyColumnDescriptor * pKeyColumn = new KeyColumnDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -82,7 +82,7 @@ KeyColumnDescriptor::KeyColumnDescriptor( * getStatics().refl.keycolumnDescriptor.pProps ) {} -Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > KeyColumnDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { 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 71f165643a03..a8fa0b40c8fb 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 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -72,7 +72,7 @@ public: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index 8e9d19d26520..0fc25059e810 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -97,7 +97,7 @@ KeyColumns::~KeyColumns() void KeyColumns::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -289,7 +289,7 @@ void KeyColumns::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& future ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { (void) future; throw com::sun::star::sdbc::SQLException( @@ -309,7 +309,7 @@ void KeyColumns::appendByDescriptor( void KeyColumns::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { (void) index; throw com::sun::star::sdbc::SQLException( @@ -347,7 +347,7 @@ void KeyColumns::dropByIndex( sal_Int32 index ) Reference< ::com::sun::star::beans::XPropertySet > KeyColumns::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -378,7 +378,7 @@ KeyColumnDescriptors::KeyColumnDescriptors( {} Reference< ::com::sun::star::beans::XPropertySet > KeyColumnDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 b05d155e9a0d..3168fc77370c 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx @@ -76,20 +76,20 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDrop virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -103,7 +103,7 @@ public: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } #endif diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx index 40e82b67bf5c..7eff2aa8ab0a 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx @@ -114,7 +114,7 @@ static sal_Int32 string2keyrule( const OUString & rule ) } void Keys::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -219,7 +219,7 @@ void Keys::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -238,7 +238,7 @@ void Keys::appendByDescriptor( void Keys::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= m_values.getLength() ) @@ -267,7 +267,7 @@ void Keys::dropByIndex( sal_Int32 index ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Keys::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return new KeyDescriptor( m_refMutex, m_origin, m_pSettings ); } @@ -302,7 +302,7 @@ Reference< com::sun::star::container::XIndexAccess > KeyDescriptors::create( } ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > KeyDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 7291dd2c7778..8f30db504b0f 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx @@ -69,20 +69,20 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDrop virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -102,7 +102,7 @@ protected: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index d802ac9634b3..146b42fb4b3e 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -102,7 +102,7 @@ Table::Table( const ::rtl::Reference< RefCountedMutex > & refMutex, m_pColumns( 0 ) {} -Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeException, std::exception) { TableDescriptor * pTable = new TableDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -111,7 +111,7 @@ Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pTable ); } -Reference< XNameAccess > Table::getColumns( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > Table::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_columns.is() ) { @@ -126,7 +126,7 @@ Reference< XNameAccess > Table::getColumns( ) throw (::com::sun::star::uno::Run return m_columns; } -Reference< XNameAccess > Table::getIndexes() throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > Table::getIndexes() throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_indexes.is() ) { @@ -140,7 +140,7 @@ Reference< XNameAccess > Table::getIndexes() throw (::com::sun::star::uno::Runti return m_indexes; } -Reference< XIndexAccess > Table::getKeys( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XIndexAccess > Table::getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_keys.is() ) { @@ -157,7 +157,7 @@ Reference< XIndexAccess > Table::getKeys( ) throw (::com::sun::star::uno::Runti void Table::rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); @@ -243,7 +243,7 @@ void Table::rename( const OUString& newName ) void Table::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) - throw (SQLException,NoSuchElementException,RuntimeException) + throw (SQLException,NoSuchElementException,RuntimeException, std::exception) { Reference< com::sun::star::container::XNameAccess > columns = Reference< com::sun::star::container::XNameAccess > ( getColumns(), UNO_QUERY ); @@ -267,7 +267,7 @@ void Table::alterColumnByName( void Table::alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) - throw (SQLException,IndexOutOfBoundsException,RuntimeException) + throw (SQLException,IndexOutOfBoundsException,RuntimeException, std::exception) { Reference< com::sun::star::container::XIndexAccess > columns = Reference< com::sun::star::container::XIndexAccess>( getColumns(), UNO_QUERY ); @@ -282,7 +282,7 @@ void Table::alterColumnByIndex( m_pColumns->refresh(); } -Sequence<Type > Table::getTypes() throw( RuntimeException ) +Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -303,12 +303,12 @@ Sequence<Type > Table::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> Table::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> Table::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.table.implementationId; } -Any Table::queryInterface( const Type & reqType ) throw (RuntimeException) +Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -326,13 +326,13 @@ Any Table::queryInterface( const Type & reqType ) throw (RuntimeException) } ::com::sun::star::uno::Any Table::getPropertyValue(const OUString& aPropertyName) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return ReflectionBase::getPropertyValue( aPropertyName ); } -OUString Table::getName( ) throw (::com::sun::star::uno::RuntimeException) +OUString Table::getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { Statics & st = getStatics(); return concatQualified( @@ -340,7 +340,7 @@ OUString Table::getName( ) throw (::com::sun::star::uno::RuntimeException) extractStringProperty( this, st.NAME ) ); } -void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) +void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { rename( aName ); } @@ -362,7 +362,7 @@ TableDescriptor::TableDescriptor( { } -Reference< XNameAccess > TableDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > TableDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_columns.is() ) { @@ -371,7 +371,7 @@ Reference< XNameAccess > TableDescriptor::getColumns( ) throw (::com::sun::star return m_columns; } -Reference< XNameAccess > TableDescriptor::getIndexes() throw (::com::sun::star::uno::RuntimeException) +Reference< XNameAccess > TableDescriptor::getIndexes() throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_indexes.is() ) { @@ -383,7 +383,7 @@ Reference< XNameAccess > TableDescriptor::getIndexes() throw (::com::sun::star:: return m_indexes; } -Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( ! m_keys.is() ) { @@ -396,7 +396,7 @@ Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (::com::sun::star:: } -Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException ) +Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -415,12 +415,12 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> TableDescriptor::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> TableDescriptor::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.tableDescriptor.implementationId; } -Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException) +Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -435,7 +435,7 @@ Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept } -Reference< XPropertySet > TableDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > TableDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { 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 d9500ce313bf..2fe6996bb0d3 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -81,35 +81,35 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException); + getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XIndexesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getIndexes( ) throw (::com::sun::star::uno::RuntimeException); + getIndexes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XKeysSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getKeys( ) throw (::com::sun::star::uno::RuntimeException); + getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XRename virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XAlterTable // Methods @@ -118,22 +118,22 @@ public: // XAlterTable const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // TODO: remove again virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& aPropertyName) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); public: // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -159,29 +159,29 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException); + getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XIndexesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getIndexes( ) throw (::com::sun::star::uno::RuntimeException); + getIndexes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XKeysSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getKeys( ) throw (::com::sun::star::uno::RuntimeException); + getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx index ae3be6d7965e..78f9048b4cd1 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx @@ -91,7 +91,7 @@ Tables::~Tables() {} void Tables::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -249,7 +249,7 @@ void Tables::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Reference< XStatement > stmt = @@ -326,7 +326,7 @@ void Tables::appendByDescriptor( void Tables::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= m_values.getLength() ) @@ -366,7 +366,7 @@ void Tables::dropByIndex( sal_Int32 index ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Tables::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 90b4b82c8524..7c5ca550fe8f 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx @@ -65,7 +65,7 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDrop // virtual void SAL_CALL dropByName( const OUString& elementName ) @@ -75,14 +75,14 @@ public: // XDrop virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx index 01ebaea86335..a446267073fa 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.cxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx @@ -97,7 +97,7 @@ User::User( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.user.pProps ) {} -Reference< XPropertySet > User::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > User::createDataDescriptor( ) throw (RuntimeException, std::exception) { UserDescriptor * pUser = new UserDescriptor( m_refMutex, m_conn, m_pSettings ); pUser->copyValuesFrom( this ); @@ -106,7 +106,7 @@ Reference< XPropertySet > User::createDataDescriptor( ) throw (RuntimeException } -Sequence<Type > User::getTypes() throw( RuntimeException ) +Sequence<Type > User::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -123,12 +123,12 @@ Sequence<Type > User::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> User::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> User::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.user.implementationId; } -Any User::queryInterface( const Type & reqType ) throw (RuntimeException) +Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -143,7 +143,7 @@ Any User::queryInterface( const Type & reqType ) throw (RuntimeException) void User::changePassword( const OUString& oldPassword, const OUString& newPassword ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { (void) oldPassword; OUStringBuffer buf(128); @@ -157,7 +157,7 @@ void User::changePassword( } sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 ret = 0xffffffff; if( isLog( m_pSettings, LogLevel::INFO ) ) @@ -175,7 +175,7 @@ sal_Int32 User::getPrivileges( const OUString& objName, sal_Int32 objType ) } sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { (void) objName; (void) objType; // all privileges @@ -183,7 +183,7 @@ sal_Int32 User::getGrantablePrivileges( const OUString& objName, sal_Int32 objTy } void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; throw com::sun::star::sdbc::SQLException("pq_driver: privilege change not implemented yet", @@ -191,7 +191,7 @@ void User::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int3 } void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; throw com::sun::star::sdbc::SQLException("pq_driver: privilege change not implemented yet", @@ -212,7 +212,7 @@ UserDescriptor::UserDescriptor( * getStatics().refl.userDescriptor.pProps ) {} -Reference< XPropertySet > UserDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > UserDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { 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 2150c8dde1df..a65b9a2ae7cb 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.hxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx @@ -65,25 +65,25 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XUser : XAuthorizable // Methods - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; @@ -98,7 +98,7 @@ public: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx index 3c017221f13f..6d7cf0b27af2 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.cxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx @@ -83,7 +83,7 @@ Users::~Users() {} void Users::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -133,7 +133,7 @@ void Users::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -151,7 +151,7 @@ void Users::appendByDescriptor( void Users::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) @@ -169,7 +169,7 @@ void Users::dropByName( const OUString& elementName ) void Users::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -201,7 +201,7 @@ void Users::dropByIndex( sal_Int32 index ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Users::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 ba596e502dc0..72567db51092 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.hxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx @@ -64,24 +64,24 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDrop virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index a40846702468..79b808fa5f2e 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -98,7 +98,7 @@ View::View( const ::rtl::Reference< RefCountedMutex > & refMutex, * getStatics().refl.view.pProps ) {} -Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException, std::exception) { ViewDescriptor * pView = new ViewDescriptor( m_refMutex, m_conn, m_pSettings ); @@ -110,7 +110,7 @@ Reference< XPropertySet > View::createDataDescriptor( ) throw (RuntimeException void View::rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -178,7 +178,7 @@ void View::rename( const OUString& newName ) } } -Sequence<Type > View::getTypes() throw( RuntimeException ) +Sequence<Type > View::getTypes() throw( RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -195,12 +195,12 @@ Sequence<Type > View::getTypes() throw( RuntimeException ) return pCollection->getTypes(); } -Sequence< sal_Int8> View::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8> View::getImplementationId() throw( RuntimeException, std::exception ) { return getStatics().refl.view.implementationId; } -Any View::queryInterface( const Type & reqType ) throw (RuntimeException) +Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception) { Any ret; @@ -213,7 +213,7 @@ Any View::queryInterface( const Type & reqType ) throw (RuntimeException) return ret; } -OUString View::getName( ) throw (::com::sun::star::uno::RuntimeException) +OUString View::getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { Statics & st = getStatics(); return concatQualified( @@ -221,7 +221,7 @@ OUString View::getName( ) throw (::com::sun::star::uno::RuntimeException) extractStringProperty( this, st.NAME ) ); } -void View::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException) +void View::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { rename( aName ); } @@ -241,7 +241,7 @@ ViewDescriptor::ViewDescriptor( * getStatics().refl.viewDescriptor.pProps ) {} -Reference< XPropertySet > ViewDescriptor::createDataDescriptor( ) throw (RuntimeException) +Reference< XPropertySet > ViewDescriptor::createDataDescriptor( ) throw (RuntimeException, std::exception) { 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 9582a375cc67..387b7e564ad5 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.hxx +++ b/connectivity/source/drivers/postgresql/pq_xview.hxx @@ -64,27 +64,27 @@ public: // XInterface virtual void SAL_CALL release() throw() { OComponentHelper::release(); } virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: // XTypeProvider, first implemented by OPropertySetHelper virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XRename virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -98,7 +98,7 @@ public: public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index 53dd469e86a9..fbc2ebaebddb 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -86,7 +86,7 @@ Views::~Views() {} void Views::refresh() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -149,7 +149,7 @@ void Views::appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -180,7 +180,7 @@ void Views::appendByDescriptor( void Views::dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) @@ -196,7 +196,7 @@ void Views::dropByName( const OUString& elementName ) void Views::dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= m_values.getLength() ) @@ -225,7 +225,7 @@ void Views::dropByIndex( sal_Int32 index ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Views::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::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 1954e78a1dcc..936e6ae9943d 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.hxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx @@ -65,24 +65,24 @@ public: // XAppend const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XDrop virtual void SAL_CALL dropByName( const OUString& elementName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception); public: // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual void SAL_CALL disposing(); |