diff options
Diffstat (limited to 'connectivity/source/drivers/postgresql')
66 files changed, 1759 insertions, 1763 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_array.cxx b/connectivity/source/drivers/postgresql/pq_array.cxx index 92cd03398a23..508174b18fb7 100644 --- a/connectivity/source/drivers/postgresql/pq_array.cxx +++ b/connectivity/source/drivers/postgresql/pq_array.cxx @@ -55,46 +55,46 @@ namespace pq_sdbc_driver OUString Array::getBaseTypeName( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return OUString( "varchar" ); } sal_Int32 Array::getBaseType( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { - return com::sun::star::sdbc::DataType::VARCHAR; + return css::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, std::exception) +css::uno::Sequence< css::uno::Any > Array::getArray( + const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return comphelper::containerToSequence(m_data); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Array::getArrayAtIndex( +css::uno::Sequence< css::uno::Any > Array::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, std::exception) + const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkRange( index, count ); return Sequence< Any > ( &m_data[index-1], count ); } -::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, std::exception) +css::uno::Reference< css::sdbc::XResultSet > Array::getResultSet( + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return getResultSetAtIndex( 0 , m_data.size() , typeMap ); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > Array::getResultSetAtIndex( +css::uno::Reference< css::sdbc::XResultSet > Array::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, std::exception) + const css::uno::Reference< css::container::XNameAccess >& /* typeMap */ ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkRange( index, count ); std::vector< std::vector< Any > > ret( count ); diff --git a/connectivity/source/drivers/postgresql/pq_array.hxx b/connectivity/source/drivers/postgresql/pq_array.hxx index ce1dc934faad..26581c6dced3 100644 --- a/connectivity/source/drivers/postgresql/pq_array.hxx +++ b/connectivity/source/drivers/postgresql/pq_array.hxx @@ -45,19 +45,19 @@ namespace pq_sdbc_driver { -class Array : public cppu::WeakImplHelper< com::sun::star::sdbc::XArray > +class Array : public cppu::WeakImplHelper< css::sdbc::XArray > { - std::vector< com::sun::star::uno::Any > m_data; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_owner; - com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > m_tc; + std::vector< css::uno::Any > m_data; + css::uno::Reference< css::uno::XInterface > m_owner; + css::uno::Reference< css::script::XTypeConverter > m_tc; rtl::Reference< RefCountedMutex > m_refMutex; public: Array( const rtl::Reference< RefCountedMutex > & mutex, - const std::vector< com::sun::star::uno::Any > & data, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & owner, - const com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > &tc) : + const std::vector< css::uno::Any > & data, + const css::uno::Reference< css::uno::XInterface > & owner, + const css::uno::Reference< css::script::XTypeConverter > &tc) : m_data( data ), m_owner( owner ), m_tc( tc ), @@ -68,31 +68,31 @@ public: // XArray // Methods virtual OUString SAL_CALL getBaseTypeName( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBaseType( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getArray( + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getArrayAtIndex( + virtual css::uno::Sequence< css::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, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::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, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSetAtIndex( + virtual css::uno::Reference< css::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, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; private: void checkRange( sal_Int32 index, sal_Int32 count ); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 3bc05b87c33c..88c2057499c5 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -129,7 +129,7 @@ BaseResultSet::BaseResultSet( const Reference< XInterface > & owner, sal_Int32 rowCount, sal_Int32 colCount, - const Reference< com::sun::star::script::XTypeConverter > & tc ) + const Reference< css::script::XTypeConverter > & tc ) : BaseResultSet_BASE( refMutex->mutex ) , OPropertySetHelper( BaseResultSet_BASE::rBHelper ) , m_owner( owner ) @@ -364,9 +364,9 @@ Any BaseResultSet::convertTo( const Any & val , const Type & type ) { aRet = m_tc->convertTo( val , type ); } - catch( com::sun::star::lang::IllegalArgumentException & ) + catch( css::lang::IllegalArgumentException & ) {} - catch( com::sun::star::script::CannotConvertException & ) + catch( css::script::CannotConvertException & ) {} return aRet; } @@ -506,32 +506,32 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32 columnIndex ) } -::com::sun::star::util::Date BaseResultSet::getDate( sal_Int32 columnIndex ) +css::util::Date BaseResultSet::getDate( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDate( getString( columnIndex ) ); } -::com::sun::star::util::Time BaseResultSet::getTime( sal_Int32 columnIndex ) +css::util::Time BaseResultSet::getTime( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toTime( getString( columnIndex ) ); } -::com::sun::star::util::DateTime BaseResultSet::getTimestamp( sal_Int32 columnIndex ) +css::util::DateTime BaseResultSet::getTimestamp( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) { return DBTypeConversion::toDateTime( getString( columnIndex ) ); } // LEM TODO: these look like they are missing an actual implementation -Reference< ::com::sun::star::io::XInputStream > BaseResultSet::getBinaryStream( sal_Int32 /* columnIndex */ ) +Reference< css::io::XInputStream > BaseResultSet::getBinaryStream( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) { return nullptr; } -Reference< ::com::sun::star::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 /* columnIndex */ ) +Reference< css::io::XInputStream > BaseResultSet::getCharacterStream( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) { return nullptr; @@ -539,31 +539,31 @@ Reference< ::com::sun::star::io::XInputStream > BaseResultSet::getCharacterStrea Any BaseResultSet::getObject( sal_Int32 /* columnIndex */, - const Reference< ::com::sun::star::container::XNameAccess >& /* typeMap */ ) + const Reference< css::container::XNameAccess >& /* typeMap */ ) throw (SQLException, RuntimeException, std::exception) { return Any(); } -Reference< ::com::sun::star::sdbc::XRef > BaseResultSet::getRef( sal_Int32 /* columnIndex */ ) +Reference< css::sdbc::XRef > BaseResultSet::getRef( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) { - return Reference< com::sun::star::sdbc::XRef > (); + return Reference< css::sdbc::XRef > (); } -Reference< ::com::sun::star::sdbc::XBlob > BaseResultSet::getBlob( sal_Int32 /* columnIndex */ ) +Reference< css::sdbc::XBlob > BaseResultSet::getBlob( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) { - return Reference< com::sun::star::sdbc::XBlob > (); + return Reference< css::sdbc::XBlob > (); } -Reference< ::com::sun::star::sdbc::XClob > BaseResultSet::getClob( sal_Int32 /* columnIndex */ ) +Reference< css::sdbc::XClob > BaseResultSet::getClob( sal_Int32 /* columnIndex */ ) throw (SQLException, RuntimeException, std::exception) { - return Reference< com::sun::star::sdbc::XClob > (); + return Reference< css::sdbc::XClob > (); } -Reference< ::com::sun::star::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex ) +Reference< css::sdbc::XArray > BaseResultSet::getArray( sal_Int32 columnIndex ) throw (SQLException, RuntimeException, std::exception) { return new Array( m_refMutex, parseArray( getString( columnIndex ) ), *this, m_tc ); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index ad3a6e6a7b0e..3a0b888334aa 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -59,19 +59,19 @@ static const sal_Int32 BASERESULTSET_RESULT_SET_TYPE = 6; #define BASERESULTSET_SIZE 7 -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XColumnLocate +typedef ::cppu::WeakComponentImplHelper< css::sdbc::XCloseable, + css::sdbc::XResultSetMetaDataSupplier, + css::sdbc::XResultSet, + css::sdbc::XRow, + css::sdbc::XColumnLocate > BaseResultSet_BASE; class BaseResultSet : public BaseResultSet_BASE, public cppu::OPropertySetHelper { protected: - com::sun::star::uno::Any m_props[BASERESULTSET_SIZE]; - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_owner; - com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > m_tc; + css::uno::Any m_props[BASERESULTSET_SIZE]; + css::uno::Reference< css::uno::XInterface > m_owner; + css::uno::Reference< css::script::XTypeConverter > m_tc; ::rtl::Reference< RefCountedMutex > m_refMutex; sal_Int32 m_row; sal_Int32 m_rowCount; @@ -82,157 +82,157 @@ protected: /** mutex should be locked before called */ virtual void checkClosed() - throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) = 0; + throw ( css::sdbc::SQLException, css::uno::RuntimeException ) = 0; void checkColumnIndex( sal_Int32 index ) - throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); + throw ( css::sdbc::SQLException, css::uno::RuntimeException ); void checkRowIndex(); - virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) = 0; - com::sun::star::uno::Any convertTo( - const ::com::sun::star::uno::Any &str, const com::sun::star::uno::Type &type ); + virtual css::uno::Any getValue( sal_Int32 columnIndex ) = 0; + css::uno::Any convertTo( + const css::uno::Any &str, const css::uno::Type &type ); protected: BaseResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, sal_Int32 rowCount, sal_Int32 columnCount, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > &tc ); + const css::uno::Reference< css::script::XTypeConverter > &tc ); virtual ~BaseResultSet(); public: // XInterface virtual void SAL_CALL acquire() throw() override { BaseResultSet_BASE::acquire(); } virtual void SAL_CALL release() throw() override { BaseResultSet_BASE::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XCloseable // virtual void SAL_CALL close( ) -// throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; +// throw (css::sdbc::SQLException, css::uno::RuntimeException) = 0; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; 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) = 0; +// virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) +// throw (css::sdbc::SQLException, css::uno::RuntimeException) = 0; public: // XResultSet // Methods virtual sal_Bool SAL_CALL next( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isBeforeFirst( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAfterLast( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isFirst( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLast( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL beforeFirst( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL afterLast( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL first( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL last( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getRow( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL previous( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL refreshRow( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowUpdated( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowInserted( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowDeleted( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XRow virtual sal_Bool SAL_CALL wasNull( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getObject( + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XColumnLocate // virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) -// throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; +// throw (css::sdbc::SQLException, css::uno::RuntimeException) = 0; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const override; // XPropertySet - ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw(css::uno::RuntimeException, std::exception) override; public: // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index ebe1aaac52f2..a8e81b5a9785 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -94,7 +94,7 @@ namespace pq_sdbc_driver // Helper class for statement lifetime management -class ClosableReference : public cppu::WeakImplHelper< com::sun::star::uno::XReference > +class ClosableReference : public cppu::WeakImplHelper< css::uno::XReference > { Connection *m_conn; ::rtl::ByteSequence m_id; @@ -126,7 +126,7 @@ OUString ConnectionGetImplementationName() { return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" ); } -com::sun::star::uno::Sequence<OUString> ConnectionGetSupportedServiceNames() +css::uno::Sequence<OUString> ConnectionGetSupportedServiceNames() { return Sequence< OUString > { "com.sun.star.sdbc.Connection" }; } @@ -166,7 +166,7 @@ static sal_Int32 readLogLevelFromConfiguration() Connection::Connection( const rtl::Reference< RefCountedMutex > &refMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & ctx ) + const css::uno::Reference< css::uno::XComponentContext > & ctx ) : ConnectionBase( refMutex->mutex ), m_ctx( ctx ) , m_refMutex( refMutex ) @@ -202,9 +202,9 @@ Connection::~Connection() m_settings.logFile = nullptr; } } -typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XCloseable > > CloseableList; +typedef ::std::list< css::uno::Reference< css::sdbc::XCloseable > > CloseableList; -typedef ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > > DisposeableList; +typedef ::std::list< css::uno::Reference< css::lang::XComponent > > DisposeableList; void Connection::close() throw ( SQLException, RuntimeException, std::exception ) { @@ -619,7 +619,7 @@ void Connection::checkClosed() throw ( SQLException, RuntimeException ) } Reference< XNameAccess > Connection::getTables() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { if( isLog( &m_settings, LogLevel::INFO ) ) { @@ -630,12 +630,12 @@ Reference< XNameAccess > Connection::getTables() m_settings.tables = Tables::create( m_refMutex, this, &m_settings , &m_settings.pTablesImpl); else // TODO: how to overcome the performance problem ? - Reference< com::sun::star::util::XRefreshable > ( m_settings.tables, UNO_QUERY )->refresh(); + Reference< css::util::XRefreshable > ( m_settings.tables, UNO_QUERY )->refresh(); return m_settings.tables; } Reference< XNameAccess > Connection::getViews() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { if( isLog( &m_settings, LogLevel::INFO ) ) { @@ -646,13 +646,13 @@ Reference< XNameAccess > Connection::getViews() m_settings.views = Views::create( m_refMutex, this, &m_settings, &(m_settings.pViewsImpl) ); else // TODO: how to overcome the performance problem ? - Reference< com::sun::star::util::XRefreshable > ( m_settings.views, UNO_QUERY )->refresh(); + Reference< css::util::XRefreshable > ( m_settings.views, UNO_QUERY )->refresh(); return m_settings.views; } Reference< XNameAccess > Connection::getUsers() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::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 e8f0dbe27917..d2cdd09a1c40 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -113,10 +113,10 @@ struct ConnectionSettings PGconn *pConnection; sal_Int32 maxNameLen; sal_Int32 maxIndexKeys; - ::com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > tc; - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > tables; - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > users; - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > views; + css::uno::Reference< css::script::XTypeConverter > tc; + css::uno::Reference< css::container::XNameAccess > tables; + css::uno::Reference< css::container::XNameAccess > users; + css::uno::Reference< css::container::XNameAccess > views; Tables *pTablesImpl; // needed to implement renaming of tables / views Views *pViewsImpl; // needed to implement renaming of tables / views OUString user; @@ -128,12 +128,12 @@ struct ConnectionSettings typedef cppu::WeakComponentImplHelper< - com::sun::star::sdbc::XConnection, - com::sun::star::sdbc::XWarningsSupplier, - com::sun::star::lang::XInitialization, - com::sun::star::sdbcx::XTablesSupplier, - com::sun::star::sdbcx::XViewsSupplier, - com::sun::star::sdbcx::XUsersSupplier > ConnectionBase; + css::sdbc::XConnection, + css::sdbc::XWarningsSupplier, + css::lang::XInitialization, + css::sdbcx::XTablesSupplier, + css::sdbcx::XViewsSupplier, + css::sdbcx::XUsersSupplier > ConnectionBase; // some types struct HashByteSequence @@ -146,7 +146,7 @@ struct HashByteSequence typedef std::unordered_map< ::rtl::ByteSequence, - ::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >, + css::uno::WeakReference< css::sdbc::XCloseable >, HashByteSequence > WeakHashMap; typedef ::std::vector< OString > OStringVector; @@ -159,89 +159,89 @@ typedef std::unordered_map class Connection : public ConnectionBase { - ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_ctx; - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_typeMap; + css::uno::Reference< css::uno::XComponentContext > m_ctx; + css::uno::Reference< css::container::XNameAccess > m_typeMap; ConnectionSettings m_settings; ::rtl::Reference< RefCountedMutex > m_refMutex; - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XDatabaseMetaData > m_meta; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_meta; WeakHashMap m_myStatements; private: void checkClosed() - throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); + throw ( css::sdbc::SQLException, css::uno::RuntimeException ); public: Connection( const rtl::Reference< RefCountedMutex > &refMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & ctx ); + const css::uno::Reference< css::uno::XComponentContext > & ctx ); virtual ~Connection( ); public: // XCloseable virtual void SAL_CALL close() - throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; 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, std::exception) override ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL nativeSQL( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getAutoCommit( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL commit( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL rollback( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isClosed( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isReadOnly( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setCatalog( const OUString& catalog ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getCatalog( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getTransactionIsolation( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTypeMap( - const ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; public: // XTablesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw (css::uno::RuntimeException, std::exception) override; public: // XUsersSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) throw (css::uno::RuntimeException, std::exception) override; public: // XViewsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getViews( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) throw (css::uno::RuntimeException, std::exception) override; public: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index fea97b414a11..4fc38e722a7c 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -99,11 +99,7 @@ using com::sun::star::uno::UNO_QUERY_THROW; namespace pq_sdbc_driver { -typedef -std::vector -< - com::sun::star::uno::Sequence< com::sun::star::uno::Any > -> SequenceAnyVector; +typedef std::vector< css::uno::Sequence< css::uno::Any > > SequenceAnyVector; #define QUOTEME(X) #X @@ -126,7 +122,7 @@ std::vector DatabaseMetaData::DatabaseMetaData( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ) : m_refMutex( refMutex ), m_pSettings( pSettings ), @@ -905,7 +901,7 @@ sal_Int32 DatabaseMetaData::getMaxCharLiteralLength( ) throw (SQLException, Run // Copied / adapted / simplified from JDBC driver sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (css::sdbc::SQLException, css::uno::RuntimeException) { MutexGuard guard( m_refMutex->mutex ); @@ -920,7 +916,7 @@ sal_Int32 DatabaseMetaData::getIntSetting(const OUString& settingName) } sal_Int32 DatabaseMetaData::getMaxNameLength() - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (css::sdbc::SQLException, css::uno::RuntimeException) { if ( m_pSettings->maxNameLen == 0) m_pSettings->maxNameLen = getIntSetting( "max_identifier_length" ); @@ -929,7 +925,7 @@ sal_Int32 DatabaseMetaData::getMaxNameLength() } sal_Int32 DatabaseMetaData::getMaxIndexKeys() - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (css::sdbc::SQLException, css::uno::RuntimeException) { if ( m_pSettings->maxIndexKeys == 0) m_pSettings->maxIndexKeys = getIntSetting("max_index_keys"); @@ -1044,7 +1040,7 @@ sal_Int32 DatabaseMetaData::getMaxUserNameLength( ) throw (SQLException, Runtim sal_Int32 DatabaseMetaData::getDefaultTransactionIsolation( ) throw (SQLException, RuntimeException, std::exception) { - return com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED; + return css::sdbc::TransactionIsolation::READ_COMMITTED; } sal_Bool DatabaseMetaData::supportsTransactions( ) throw (SQLException, RuntimeException, std::exception) @@ -1054,10 +1050,10 @@ sal_Bool DatabaseMetaData::supportsTransactions( ) throw (SQLException, Runtime 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 - || level == com::sun::star::sdbc::TransactionIsolation::READ_UNCOMMITTED - || level == com::sun::star::sdbc::TransactionIsolation::REPEATABLE_READ) + if ( level == css::sdbc::TransactionIsolation::READ_COMMITTED + || level == css::sdbc::TransactionIsolation::SERIALIZABLE + || level == css::sdbc::TransactionIsolation::READ_UNCOMMITTED + || level == css::sdbc::TransactionIsolation::REPEATABLE_READ) return true; else return false; @@ -1084,8 +1080,8 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc return false; } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getProcedures( - const ::com::sun::star::uno::Any& catalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getProcedures( + const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (SQLException, RuntimeException, std::exception) { @@ -1109,8 +1105,8 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc m_refMutex, *this, std::vector< OUString >(), std::vector< std::vector< Any > > (), m_pSettings->tc ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getProcedureColumns( - const ::com::sun::star::uno::Any& catalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getProcedureColumns( + const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) @@ -1123,11 +1119,11 @@ sal_Bool DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw (SQLExc m_refMutex, *this, std::vector< OUString >(), std::vector< std::vector< Any > >(), m_pSettings->tc ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTables( - const ::com::sun::star::uno::Any& catalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getTables( + const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const ::com::sun::star::uno::Sequence< OUString >& types ) + const css::uno::Sequence< OUString >& types ) throw (SQLException, RuntimeException, std::exception) { (void) catalog; (void) types; @@ -1262,7 +1258,7 @@ namespace }; } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getSchemas( ) +css::uno::Reference< XResultSet > DatabaseMetaData::getSchemas( ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -1297,7 +1293,7 @@ namespace m_refMutex, *this, getStatics().schemaNames, vec, m_pSettings->tc ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs( ) +css::uno::Reference< XResultSet > DatabaseMetaData::getCatalogs( ) throw (SQLException, RuntimeException, std::exception) { // LEM TODO: return the current catalog like JDBC driver? @@ -1307,7 +1303,7 @@ namespace m_refMutex, *this, std::vector< OUString >(), std::vector< std::vector< Any > >(), m_pSettings->tc ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTableTypes( ) +css::uno::Reference< XResultSet > DatabaseMetaData::getTableTypes( ) throw (SQLException, RuntimeException, std::exception) { // LEM TODO: this can be made dynamic, see JDBC driver @@ -1322,11 +1318,11 @@ namespace */ sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype ) { -// sal_Int32 ret = com::sun::star::sdbc::DataType::DISTINCT; +// sal_Int32 ret = css::sdbc::DataType::DISTINCT; // map all unknown types to memo (longvarchar). This allows to show them in // string representation. Additionally, the edit-table-type-selection-box // is not so unusable anymore. - sal_Int32 ret = com::sun::star::sdbc::DataType::LONGVARCHAR; + sal_Int32 ret = css::sdbc::DataType::LONGVARCHAR; if( typtype == "b" ) { // as long as the OOo framework does not support arrays, @@ -1335,7 +1331,7 @@ sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype // { // its just a naming convention, but as long as we don't have anything better, // we take it as granted -// ret = com::sun::star::sdbc::DataType::ARRAY; +// ret = css::sdbc::DataType::ARRAY; // } // base type Statics &statics = getStatics(); @@ -1347,11 +1343,11 @@ sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype } else if( typtype == "c" ) { - ret = com::sun::star::sdbc::DataType::STRUCT; + ret = css::sdbc::DataType::STRUCT; } else if( typtype == "d" ) { - ret = com::sun::star::sdbc::DataType::LONGVARCHAR; + ret = css::sdbc::DataType::LONGVARCHAR; } return ret; } @@ -1380,8 +1376,8 @@ namespace { { switch( dataType ) { - case com::sun::star::sdbc::DataType::NUMERIC: - case com::sun::star::sdbc::DataType::DECIMAL: + case css::sdbc::DataType::NUMERIC: + case css::sdbc::DataType::DECIMAL: { *precision = ( ( atttypmod - PQ_VARHDRSZ ) >> 16 ) & 0xffff; *scale = (atttypmod - PQ_VARHDRSZ ) & 0xffff; @@ -1460,8 +1456,8 @@ static void columnMetaData2DatabaseTypeDescription( } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getColumns( - const ::com::sun::star::uno::Any& catalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getColumns( + const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) @@ -1619,12 +1615,12 @@ static void columnMetaData2DatabaseTypeDescription( // row[9] RADIX TODO if( xRow->getBoolean( 6 ) && ! isSystemColumn(xRow->getInt( 12 )) ) { - row[10] <<= OUString::number(com::sun::star::sdbc::ColumnValue::NO_NULLS); + row[10] <<= OUString::number(css::sdbc::ColumnValue::NO_NULLS); row[17] <<= statics.NO; } else { - row[10] <<= OUString::number(com::sun::star::sdbc::ColumnValue::NULLABLE); + row[10] <<= OUString::number(css::sdbc::ColumnValue::NULLABLE); row[17] <<= statics.YES; } @@ -1646,8 +1642,8 @@ static void columnMetaData2DatabaseTypeDescription( m_refMutex, *this, statics.columnRowNames, vec, m_pSettings->tc ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges( - const ::com::sun::star::uno::Any& catalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getColumnPrivileges( + const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (SQLException, RuntimeException, std::exception) @@ -1678,8 +1674,8 @@ static void columnMetaData2DatabaseTypeDescription( return rs; } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTablePrivileges( - const ::com::sun::star::uno::Any&, +css::uno::Reference< XResultSet > DatabaseMetaData::getTablePrivileges( + const css::uno::Any&, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (SQLException, RuntimeException, std::exception) { @@ -1704,8 +1700,8 @@ static void columnMetaData2DatabaseTypeDescription( return rs; } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier( - const ::com::sun::star::uno::Any&, +css::uno::Reference< XResultSet > DatabaseMetaData::getBestRowIdentifier( + const css::uno::Any&, const OUString&, const OUString&, sal_Int32, @@ -1717,8 +1713,8 @@ static void columnMetaData2DatabaseTypeDescription( m_refMutex, *this, std::vector< OUString >(), std::vector< std::vector< Any > >(), m_pSettings->tc ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns( - const ::com::sun::star::uno::Any&, +css::uno::Reference< XResultSet > DatabaseMetaData::getVersionColumns( + const css::uno::Any&, const OUString&, const OUString& ) throw (SQLException, RuntimeException, std::exception) { @@ -1728,8 +1724,8 @@ static void columnMetaData2DatabaseTypeDescription( m_refMutex, *this, std::vector< OUString >(), std::vector< std::vector< Any > >(), m_pSettings->tc ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getPrimaryKeys( - const ::com::sun::star::uno::Any&, +css::uno::Reference< XResultSet > DatabaseMetaData::getPrimaryKeys( + const css::uno::Any&, const OUString& schema, const OUString& table ) throw (SQLException, RuntimeException, std::exception) { @@ -2076,7 +2072,7 @@ void DatabaseMetaData::init_getPrivs_stmt () m_getColumnPrivs_stmt = m_origin->prepareStatement( sSQL.makeStringAndClear() ); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys( +css::uno::Reference< XResultSet > DatabaseMetaData::getImportedExportedKeys( const Any& /* primaryCatalog */, const OUString& primarySchema, const OUString& primaryTable, @@ -2113,27 +2109,27 @@ void DatabaseMetaData::init_getPrivs_stmt () } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys( - const ::com::sun::star::uno::Any& catalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getImportedKeys( + const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (SQLException, RuntimeException, std::exception) { return getImportedExportedKeys(Any(), OUString(), OUString(), catalog, schema, table); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getExportedKeys( - const ::com::sun::star::uno::Any& catalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getExportedKeys( + const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (SQLException, RuntimeException, std::exception) { return getImportedExportedKeys(catalog, schema, table, Any(), OUString(), OUString()); } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getCrossReference( - const ::com::sun::star::uno::Any& primaryCatalog, +css::uno::Reference< XResultSet > DatabaseMetaData::getCrossReference( + const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, - const ::com::sun::star::uno::Any& foreignCatalog, + const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (SQLException, RuntimeException, std::exception) { @@ -2211,11 +2207,11 @@ namespace sal_Int32 calcSearchable( sal_Int32 dataType ) { - sal_Int32 ret = com::sun::star::sdbc::ColumnSearch::FULL; - if( com::sun::star::sdbc::DataType::BINARY == dataType || - com::sun::star::sdbc::DataType::VARBINARY == dataType || - com::sun::star::sdbc::DataType::LONGVARBINARY == dataType ) - ret = com::sun::star::sdbc::ColumnSearch::NONE; + sal_Int32 ret = css::sdbc::ColumnSearch::FULL; + if( css::sdbc::DataType::BINARY == dataType || + css::sdbc::DataType::VARBINARY == dataType || + css::sdbc::DataType::LONGVARBINARY == dataType ) + ret = css::sdbc::ColumnSearch::NONE; return ret; } @@ -2224,7 +2220,7 @@ namespace { // LEM TODO: review, see where used, see JDBC, ... sal_Int32 ret = 0; - if( dataType == com::sun::star::sdbc::DataType::NUMERIC ) + if( dataType == css::sdbc::DataType::NUMERIC ) ret = 1000; // see pg-docs DataType/numeric // else if( dataType == DataType::DOUBLE ) // ret = 308; @@ -2287,8 +2283,8 @@ namespace sal_Int32 dataType =typeNameToDataType(xRow->getString(5),xRow->getString(2)); sal_Int32 precision = xRow->getString(3).toInt32(); - if( dataType == com::sun::star::sdbc::DataType::CHAR || - ( dataType == com::sun::star::sdbc::DataType::VARCHAR && + if( dataType == css::sdbc::DataType::CHAR || + ( dataType == css::sdbc::DataType::VARCHAR && xRow->getString(TYPE_NAME+1).equalsIgnoreAsciiCase("varchar") ) ) { // reflect varchar as varchar with upper limit ! @@ -2298,7 +2294,7 @@ namespace precision = 0x40000000; // about 1 GB, see character type docs in postgresql row[CREATE_PARAMS] <<= OUString("length"); } - else if( dataType == com::sun::star::sdbc::DataType::NUMERIC ) + else if( dataType == css::sdbc::DataType::NUMERIC ) { precision = 1000; row[CREATE_PARAMS] <<= OUString("length, scale"); @@ -2308,14 +2304,14 @@ namespace row[DATA_TYPE] <<= OUString::number(dataType); row[PRECISION] <<= OUString::number( precision ); sal_Int32 nullable = xRow->getBoolean(4) ? - com::sun::star::sdbc::ColumnValue::NO_NULLS : - com::sun::star::sdbc::ColumnValue::NULLABLE; + css::sdbc::ColumnValue::NO_NULLS : + css::sdbc::ColumnValue::NULLABLE; row[NULLABLE] <<= OUString::number(nullable); row[CASE_SENSITIVE] <<= OUString::number(1); row[SEARCHABLE] <<= OUString::number( calcSearchable( dataType ) ); row[UNSIGNED_ATTRIBUTE] <<= OUString("0"); - if( com::sun::star::sdbc::DataType::INTEGER == dataType || - com::sun::star::sdbc::DataType::BIGINT == dataType ) + if( css::sdbc::DataType::INTEGER == dataType || + css::sdbc::DataType::BIGINT == dataType ) row[AUTO_INCREMENT] <<= OUString("1"); // TODO else row[AUTO_INCREMENT] <<= OUString("0"); // TODO @@ -2329,7 +2325,7 @@ namespace } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getTypeInfo( ) +css::uno::Reference< XResultSet > DatabaseMetaData::getTypeInfo( ) throw (SQLException, RuntimeException, std::exception) { // Note: Indexes start at 0 (in the API doc, they start at 1) @@ -2380,8 +2376,8 @@ namespace } -::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo( - const ::com::sun::star::uno::Any& , +css::uno::Reference< XResultSet > DatabaseMetaData::getIndexInfo( + const css::uno::Any& , const OUString& schema, const OUString& table, sal_Bool unique, @@ -2473,8 +2469,8 @@ namespace bool isPrimary = xRow->getBoolean( C_IS_PRIMARY ); (void)isPrimary; sal_Int32 indexType = xRow->getBoolean( C_IS_CLUSTERED ) ? - com::sun::star::sdbc::IndexType::CLUSTERED : - com::sun::star::sdbc::IndexType::HASHED; + css::sdbc::IndexType::CLUSTERED : + css::sdbc::IndexType::HASHED; paramColumn->setString( C_SCHEMA, currentSchema ); paramColumn->setString( C_TABLENAME, currentTable ); @@ -2508,7 +2504,7 @@ namespace sal_Bool DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw (SQLException, RuntimeException, std::exception) { - if ( setType == com::sun::star::sdbc::ResultSetType::SCROLL_SENSITIVE ) + if ( setType == css::sdbc::ResultSetType::SCROLL_SENSITIVE ) return false; else return true; @@ -2573,7 +2569,7 @@ sal_Bool DatabaseMetaData::supportsBatchUpdates( ) throw (SQLException, Runtime return true; } -css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const ::com::sun::star::uno::Any&, const OUString&, const OUString&, const ::com::sun::star::uno::Sequence< sal_Int32 >& ) throw (SQLException, RuntimeException, std::exception) +css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const css::uno::Any&, const OUString&, const OUString&, const css::uno::Sequence< sal_Int32 >& ) throw (SQLException, RuntimeException, std::exception) { //LEM TODO: implement! See JDBC driver MutexGuard guard( m_refMutex->mutex ); @@ -2581,7 +2577,7 @@ css::uno::Reference< XResultSet > DatabaseMetaData::getUDTs( const ::com::sun::s m_refMutex, *this, std::vector< OUString >(), std::vector< std::vector< Any > >(), m_pSettings->tc ); } -::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > DatabaseMetaData::getConnection() +css::uno::Reference< css::sdbc::XConnection > DatabaseMetaData::getConnection() throw (SQLException, RuntimeException, std::exception) { return m_origin; diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx index c6c517168fa1..1b84178fd0b7 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.hxx @@ -46,184 +46,184 @@ namespace pq_sdbc_driver { class DatabaseMetaData : - public ::cppu::WeakImplHelper< com::sun::star::sdbc::XDatabaseMetaData > + public ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData > { ::rtl::Reference< RefCountedMutex > m_refMutex; ConnectionSettings *m_pSettings; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_origin; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_getIntSetting_stmt; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_getReferences_stmt[16]; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_getTablePrivs_stmt; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_getColumnPrivs_stmt; + css::uno::Reference< css::sdbc::XConnection > m_origin; + css::uno::Reference< css::sdbc::XPreparedStatement > m_getIntSetting_stmt; + css::uno::Reference< css::sdbc::XPreparedStatement > m_getReferences_stmt[16]; + css::uno::Reference< css::sdbc::XPreparedStatement > m_getTablePrivs_stmt; + css::uno::Reference< css::sdbc::XPreparedStatement > m_getColumnPrivs_stmt; - sal_Int32 getIntSetting(const OUString& settingName) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getMaxIndexKeys() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getMaxNameLength() throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > getImportedExportedKeys( - 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); + sal_Int32 getIntSetting(const OUString& settingName) throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getMaxIndexKeys() throw (css::sdbc::SQLException, css::uno::RuntimeException); + sal_Int32 getMaxNameLength() throw (css::sdbc::SQLException, css::uno::RuntimeException); + css::uno::Reference< css::sdbc::XResultSet > getImportedExportedKeys( + const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, + const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) + throw (css::sdbc::SQLException, css::uno::RuntimeException); void init_getReferences_stmt (); void init_getPrivs_stmt (); public: DatabaseMetaData( const ::rtl::Reference< RefCountedMutex > & reMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); public: // Methods - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; - 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) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getUserName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDatabaseProductName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDriverName( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDriverVersion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSQLKeywords( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNumericFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSystemFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchStringEscape( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSchemaTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getProcedureTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalogTerm( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalogSeparator( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnion( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 996bae9f97ff..5388f3409e50 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -123,19 +123,19 @@ sal_Int32 Driver::getMinorVersion( ) throw (RuntimeException, std::exception) // XServiceInfo OUString SAL_CALL Driver::getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return DriverGetImplementationName(); } sal_Bool Driver::supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > Driver::getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return DriverGetSupportedServiceNames(); } @@ -198,12 +198,12 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override + throw(css::uno::RuntimeException, std::exception) override { return m_implName; } sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException, std::exception) override + throw(css::uno::RuntimeException, std::exception) override { for( int i = 0 ; i < m_serviceNames.getLength() ; i ++ ) if( m_serviceNames[i] == ServiceName ) @@ -211,7 +211,7 @@ public: return false; } Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override + throw(css::uno::RuntimeException, std::exception) override { return m_serviceNames; } @@ -270,7 +270,7 @@ void OOneInstanceComponentFactory::disposing() // Reference< XSingleComponentFactory > createOneInstanceComponentFactory( // cppu::ComponentFactoryFunc fptr, // OUString const & rImplementationName, -// ::com::sun::star::uno::Sequence< OUString > const & rServiceNames, +// css::uno::Sequence< OUString > const & rServiceNames, // rtl_ModuleCount * pModCount = 0 ) // // { @@ -300,9 +300,9 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL postgresql_sdbc_component_getFactory( // XSingleComponentFactory interface ... void * pRet = nullptr; Reference< XSingleComponentFactory > xFactory; - Reference< com::sun::star::lang::XMultiServiceFactory > xSmgr( + Reference< css::lang::XMultiServiceFactory > xSmgr( static_cast< XInterface * >(pServiceManager), - com::sun::star::uno::UNO_QUERY_THROW ); + css::uno::UNO_QUERY_THROW ); for( sal_Int32 i = 0 ; g_entries[i].create ; i ++ ) { diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index 899efd680e97..9217b8825d27 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -60,62 +60,62 @@ namespace pq_sdbc_driver struct MutexHolder { osl::Mutex m_mutex; }; // use this to switch off sdbc support ! // typedef cppu::WeakComponentImplHelper< -// com::sun::star::sdbc::XDriver, -// com::sun::star::lang::XServiceInfo +// css::sdbc::XDriver, +// css::lang::XServiceInfo // > DriverBase ; typedef cppu::WeakComponentImplHelper< - com::sun::star::sdbc::XDriver, - com::sun::star::lang::XServiceInfo, - com::sun::star::sdbcx::XDataDefinitionSupplier > DriverBase ; + css::sdbc::XDriver, + css::lang::XServiceInfo, + css::sdbcx::XDataDefinitionSupplier > DriverBase ; class Driver : public MutexHolder, public DriverBase { - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_ctx; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory > m_smgr; + css::uno::Reference< css::uno::XComponentContext > m_ctx; + css::uno::Reference< css::lang::XMultiComponentFactory > m_smgr; public: - explicit Driver ( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > & ctx ) + explicit Driver ( const css::uno::Reference < css::uno::XComponentContext > & ctx ) : DriverBase( this->m_mutex ), m_ctx( ctx ), m_smgr( ctx->getServiceManager() ) {} public: // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( + virtual css::uno::Reference< css::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, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( + virtual css::uno::Sequence< css::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, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; public: // XServiceInfo // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; public: // XDataDefinitionSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL + virtual css::uno::Reference< css::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, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL + const css::uno::Reference< css::sdbc::XConnection >& connection ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::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, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& info ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XComponent virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx index ff6aa44b3d69..5a91ad938cdc 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx @@ -55,7 +55,7 @@ namespace pq_sdbc_driver FakedUpdateableResultSet::FakedUpdateableResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, ConnectionSettings **pSettings, PGresult *result, const OUString &schema, @@ -66,9 +66,9 @@ FakedUpdateableResultSet::FakedUpdateableResultSet( {} -com::sun::star::uno::Any FakedUpdateableResultSet::queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any FakedUpdateableResultSet::queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) { Any ret = ResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -80,8 +80,8 @@ 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, std::exception ) +css::uno::Sequence< css::uno::Type > FakedUpdateableResultSet::getTypes() + throw( css::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -100,8 +100,8 @@ 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, std::exception ) +css::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementationId() + throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -182,42 +182,42 @@ void FakedUpdateableResultSet::updateString( sal_Int32 /* columnIndex */, const 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, std::exception) +void FakedUpdateableResultSet::updateBytes( sal_Int32 /* columnIndex */, const css::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, std::exception) +void FakedUpdateableResultSet::updateDate( sal_Int32 /* columnIndex */, const css::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, std::exception) +void FakedUpdateableResultSet::updateTime( sal_Int32 /* columnIndex */, const css::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, std::exception) +void FakedUpdateableResultSet::updateTimestamp( sal_Int32 /* columnIndex */, const css::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, std::exception) +void FakedUpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::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, std::exception) +void FakedUpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::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, std::exception) +void FakedUpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::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, std::exception) +void FakedUpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::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 c6399066be5d..1830f4186678 100644 --- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx @@ -49,15 +49,15 @@ namespace pq_sdbc_driver */ class FakedUpdateableResultSet : public ResultSet, - public com::sun::star::sdbc::XResultSetUpdate, - public com::sun::star::sdbc::XRowUpdate + public css::sdbc::XResultSetUpdate, + public css::sdbc::XRowUpdate { OUString m_aReason; public: FakedUpdateableResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, ConnectionSettings **pSettings, PGresult *result, const OUString &schema, @@ -67,42 +67,42 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { ResultSet::acquire(); } virtual void SAL_CALL release() throw() override { ResultSet::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deleteRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancelRowUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL moveToInsertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL moveToCurrentRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 15c9b1e99509..86a3a6741d9f 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -174,9 +174,9 @@ PreparedStatement::PreparedStatement( m_props[PREPARED_STATEMENT_QUERY_TIME_OUT] = makeAny( (sal_Int32)0 ); m_props[PREPARED_STATEMENT_MAX_ROWS] = makeAny( (sal_Int32)0 ); m_props[PREPARED_STATEMENT_RESULT_SET_CONCURRENCY] = makeAny( - com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY ); + css::sdbc::ResultSetConcurrency::READ_ONLY ); m_props[PREPARED_STATEMENT_RESULT_SET_TYPE] = makeAny( - com::sun::star::sdbc::ResultSetType::SCROLL_INSENSITIVE ); + css::sdbc::ResultSetType::SCROLL_INSENSITIVE ); splitSQL( m_stmt, m_splittedStatement ); int elements = 0; @@ -307,7 +307,7 @@ Reference< XResultSet > PreparedStatement::executeQuery( ) { raiseSQLException( "not a query" ); } - return Reference< XResultSet > ( m_lastResultset, com::sun::star::uno::UNO_QUERY ); + return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 PreparedStatement::executeUpdate( ) @@ -554,20 +554,20 @@ void PreparedStatement::setBytes( } -void PreparedStatement::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) +void PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateString( x ) ); } -void PreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) +void PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toTimeString( x ) ); } void PreparedStatement::setTimestamp( - sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) + sal_Int32 parameterIndex, const css::util::DateTime& x ) throw (SQLException, RuntimeException, std::exception) { setString( parameterIndex, DBTypeConversion::toDateTimeString( x ) ); @@ -575,7 +575,7 @@ void PreparedStatement::setTimestamp( void PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, - const Reference< ::com::sun::star::io::XInputStream >& x, + const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (SQLException, RuntimeException, std::exception) { @@ -587,7 +587,7 @@ void PreparedStatement::setBinaryStream( void PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, - const Reference< ::com::sun::star::io::XInputStream >& x, + const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (SQLException, RuntimeException, std::exception) { @@ -617,8 +617,8 @@ void PreparedStatement::setObjectWithInfo( throw (SQLException, RuntimeException, std::exception) { (void) scale; - if( com::sun::star::sdbc::DataType::DECIMAL == targetSqlType || - com::sun::star::sdbc::DataType::NUMERIC == targetSqlType ) + if( css::sdbc::DataType::DECIMAL == targetSqlType || + css::sdbc::DataType::NUMERIC == targetSqlType ) { double myDouble = 0.0; OUString myString; @@ -710,11 +710,11 @@ void PreparedStatement::clearWarnings( ) { } -Reference< ::com::sun::star::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() +Reference< css::sdbc::XResultSetMetaData > PreparedStatement::getMetaData() throw (SQLException,RuntimeException, std::exception) { - Reference< com::sun::star::sdbc::XResultSetMetaData > ret; - Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); + Reference< css::sdbc::XResultSetMetaData > ret; + Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); if( supplier.is() ) ret = supplier->getMetaData(); return ret; @@ -798,17 +798,17 @@ void PreparedStatement::disposing() Reference< XResultSet > PreparedStatement::getResultSet( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { - return Reference< XResultSet > ( m_lastResultset, com::sun::star::uno::UNO_QUERY ); + return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 PreparedStatement::getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool PreparedStatement::getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return false; } diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx index 11e449f940c8..7ce5ae284de5 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx @@ -64,22 +64,22 @@ static const sal_Int32 PREPARED_STATEMENT_RESULT_SET_TYPE = 8; #define PREPARED_STATEMENT_SIZE 9 -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XMultipleResults, - ::com::sun::star::sdbc::XGeneratedResultSet, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier +typedef ::cppu::WeakComponentImplHelper< css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XCloseable, + css::sdbc::XWarningsSupplier, + css::sdbc::XMultipleResults, + css::sdbc::XGeneratedResultSet, + css::sdbc::XResultSetMetaDataSupplier > PreparedStatement_BASE; class PreparedStatement : public PreparedStatement_BASE, public cppu::OPropertySetHelper { private: - com::sun::star::uno::Any m_props[PREPARED_STATEMENT_SIZE]; - com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_connection; + css::uno::Any m_props[PREPARED_STATEMENT_SIZE]; + css::uno::Reference< css::sdbc::XConnection > m_connection; ConnectionSettings *m_pSettings; - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > m_lastResultset; + css::uno::Reference< css::sdbc::XCloseable > m_lastResultset; OString m_stmt; OString m_executedStatement; ::rtl::Reference< RefCountedMutex > m_refMutex; @@ -97,7 +97,7 @@ public: * as long as a reference to paramenter con is held. */ PreparedStatement( const rtl::Reference< RefCountedMutex > & refMutex, - const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection> & con, + const css::uno::Reference< css::sdbc::XConnection> & con, struct ConnectionSettings *pSettings, const OString &stmt ); @@ -105,154 +105,154 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { PreparedStatement_BASE::acquire(); } virtual void SAL_CALL release() throw() override { PreparedStatement_BASE::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL executeUpdate( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL execute( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; - 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, std::exception) override; - 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, std::exception) override; + sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTimestamp( - sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Int32 parameterIndex, const css::util::DateTime& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, + const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, + const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, - const ::com::sun::star::uno::Any& x, + const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::uno::Reference< css::sdbc::XRef >& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XBlob >& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setClob( sal_Int32 parameterIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XClob >& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setArray( sal_Int32 parameterIndex, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XArray >& x ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearParameters( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const override; // XPropertySet - ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw(css::uno::RuntimeException, std::exception) override; public: // XGeneratedResultSet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // OComponentHelper virtual void SAL_CALL disposing() override; private: void checkColumnIndex( sal_Int32 parameterIndex ); - void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException); + void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException); void raiseSQLException( const char * errorMsg ) - throw ( com::sun::star::sdbc::SQLException ); + throw ( css::sdbc::SQLException ); // PGresult *pgExecute( OString *pQuery ); }; diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index 4cc7254b2523..1e7ed65b4989 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -61,7 +61,7 @@ namespace pq_sdbc_driver { void ResultSet::checkClosed() - throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) + throw ( css::sdbc::SQLException, css::uno::RuntimeException ) { if( ! m_result ) { @@ -96,15 +96,15 @@ ResultSet::ResultSet( const ::rtl::Reference< RefCountedMutex > & refMutex, // Fetch direction and size are cursor-specific things, so not used now. // Fetch size not set m_props[ BASERESULTSET_FETCH_DIRECTION ] = makeAny( - com::sun::star::sdbc::FetchDirection::UNKNOWN); + css::sdbc::FetchDirection::UNKNOWN); // No escape processing for now m_props[ BASERESULTSET_ESCAPE_PROCESSING ] <<= false; // Bookmarks not implemented for now m_props[ BASERESULTSET_IS_BOOKMARKABLE ] <<= false; m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] = makeAny( - com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY ); + css::sdbc::ResultSetConcurrency::READ_ONLY ); m_props[ BASERESULTSET_RESULT_SET_TYPE ] = makeAny( - com::sun::star::sdbc::ResultSetType::SCROLL_INSENSITIVE ); + css::sdbc::ResultSetType::SCROLL_INSENSITIVE ); } @@ -260,7 +260,7 @@ static bool isTimestamp( const char * data, sal_Int32 len ) sal_Int32 ResultSet::guessDataType( sal_Int32 column ) { // we don't look into more than 100 rows ... - sal_Int32 ret = com::sun::star::sdbc::DataType::INTEGER; + sal_Int32 ret = css::sdbc::DataType::INTEGER; int maxRows = ( m_rowCount > 100 ? 100 : m_rowCount ); for( int i = 0 ; i < maxRows ; i ++ ) @@ -270,37 +270,37 @@ sal_Int32 ResultSet::guessDataType( sal_Int32 column ) const char * p = PQgetvalue( m_result, i , column -1 ); int len = PQgetlength( m_result, i , column -1 ); - if( com::sun::star::sdbc::DataType::INTEGER == ret ) + if( css::sdbc::DataType::INTEGER == ret ) { if( ! isInteger( p,len ) ) - ret = com::sun::star::sdbc::DataType::NUMERIC; + ret = css::sdbc::DataType::NUMERIC; } - if( com::sun::star::sdbc::DataType::NUMERIC == ret ) + if( css::sdbc::DataType::NUMERIC == ret ) { if( ! isNumber( p,len ) ) { - ret = com::sun::star::sdbc::DataType::DATE; + ret = css::sdbc::DataType::DATE; } } - if( com::sun::star::sdbc::DataType::DATE == ret ) + if( css::sdbc::DataType::DATE == ret ) { if( ! isDate( p,len ) ) { - ret = com::sun::star::sdbc::DataType::TIME; + ret = css::sdbc::DataType::TIME; } } - if( com::sun::star::sdbc::DataType::TIME == ret ) + if( css::sdbc::DataType::TIME == ret ) { if( ! isTime( p,len ) ) { - ret = com::sun::star::sdbc::DataType::TIMESTAMP; + ret = css::sdbc::DataType::TIMESTAMP; } } - if( com::sun::star::sdbc::DataType::TIMESTAMP == ret ) + if( css::sdbc::DataType::TIMESTAMP == ret ) { if( ! isTimestamp( p,len ) ) { - ret = com::sun::star::sdbc::DataType::LONGVARCHAR; + ret = css::sdbc::DataType::LONGVARCHAR; break; } } diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx index 7d0b82bf4c2b..58a5f4de1d94 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx @@ -62,16 +62,16 @@ protected: /** mutex should be locked before called */ virtual void checkClosed() - throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) override; + throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override; /** unchecked, acquire mutex before calling */ - virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) override; + virtual css::uno::Any getValue( sal_Int32 columnIndex ) override; public: ResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, ConnectionSettings **pSettings, PGresult *result, const OUString &schema, @@ -80,15 +80,15 @@ public: public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: sal_Int32 guessDataType( sal_Int32 column ); diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index 2fab50b466bf..c2e64df1efcc 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -76,7 +76,7 @@ namespace pq_sdbc_driver // OUString tableName; // OUString schemaTableName; // OUString typeName; -// com::sun::star::sdbc::DataType type; +// css::sdbc::DataType type; // sal_Int32 precision; // sal_Int32 scale; // sal_Bool isCurrency; @@ -113,7 +113,7 @@ static void extractPrecisionAndScale( sal_Int32 atttypmod, sal_Int32 *precision, ResultSetMetaData::ResultSetMetaData( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > & origin, + const css::uno::Reference< css::sdbc::XResultSet > & origin, ResultSet * pResultSet, ConnectionSettings **ppSettings, PGresult *pResult, @@ -146,7 +146,7 @@ ResultSetMetaData::ResultSetMetaData( char *name = PQfname( pResult, col ); m_colDesc[col].name = OUString( name, strlen(name) , (*m_ppSettings)->encoding ); m_colDesc[col].typeOid = PQftype( pResult, col ); - m_colDesc[col].type = com::sun::star::sdbc::DataType::LONGVARCHAR; + m_colDesc[col].type = css::sdbc::DataType::LONGVARCHAR; } } @@ -198,7 +198,7 @@ void ResultSetMetaData::checkTable() if( m_tableName.getLength() ) { - Reference< com::sun::star::container::XNameAccess > tables = (*m_ppSettings)->tables; + Reference< css::container::XNameAccess > tables = (*m_ppSettings)->tables; if( ! tables.is() ) { @@ -233,7 +233,7 @@ sal_Int32 ResultSetMetaData::getIntColumnProperty( const OUString & name, int in set->getPropertyValue( name ) >>= ret; } } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { } return ret; @@ -252,14 +252,14 @@ bool ResultSetMetaData::getBoolColumnProperty( const OUString & name, int index, set->getPropertyValue( name ) >>= ret; } } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { } return ret; } -Reference< com::sun::star::beans::XPropertySet > ResultSetMetaData::getColumnByIndex( int index ) +Reference< css::beans::XPropertySet > ResultSetMetaData::getColumnByIndex( int index ) { Reference< XPropertySet > ret; checkTable(); @@ -316,7 +316,7 @@ sal_Int32 ResultSetMetaData::isNullable( sal_Int32 column ) throw (SQLException, RuntimeException, std::exception) { return getIntColumnProperty( - getStatics().IS_NULLABLE, column, com::sun::star::sdbc::ColumnValue::NULLABLE_UNKNOWN ); + getStatics().IS_NULLABLE, column, css::sdbc::ColumnValue::NULLABLE_UNKNOWN ); } sal_Bool ResultSetMetaData::isSigned( sal_Int32 column ) @@ -390,7 +390,7 @@ sal_Int32 ResultSetMetaData::getColumnType( sal_Int32 column ) if( -100 == ret ) { checkForTypes(); - if( com::sun::star::sdbc::DataType::LONGVARCHAR == m_colDesc[column-1].type && m_pResultSet ) + if( css::sdbc::DataType::LONGVARCHAR == m_colDesc[column-1].type && m_pResultSet ) m_colDesc[column-1].type = m_pResultSet->guessDataType( column ); ret = m_colDesc[column-1].type; } @@ -417,7 +417,7 @@ OUString ResultSetMetaData::getColumnTypeName( sal_Int32 column ) ret = m_colDesc[column-1].typeName; } } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { } return ret; @@ -450,7 +450,7 @@ OUString ResultSetMetaData::getColumnServiceName( sal_Int32 column ) } void ResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (css::sdbc::SQLException, css::uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_colCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx index d28356a42509..1642fc4029f7 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx @@ -62,12 +62,12 @@ struct ColDesc class ResultSet; class ResultSetMetaData : - public ::cppu::WeakImplHelper< com::sun::star::sdbc::XResultSetMetaData > + public ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData > { ::rtl::Reference< RefCountedMutex > m_refMutex; ConnectionSettings **m_ppSettings; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_origin; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_table; + css::uno::Reference< css::sdbc::XResultSet > m_origin; + css::uno::Reference< css::beans::XPropertySet > m_table; OUString m_tableName; OUString m_schemaName; std::vector< ColDesc > m_colDesc; @@ -79,10 +79,10 @@ class ResultSetMetaData : sal_Int32 m_colCount; void checkColumnIndex( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (css::sdbc::SQLException, css::uno::RuntimeException); void checkTable(); void checkForTypes(); - com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getColumnByIndex( int index ); + css::uno::Reference< css::beans::XPropertySet > getColumnByIndex( int index ); sal_Int32 getIntColumnProperty( const OUString & name, int index, int def ); bool getBoolColumnProperty( const OUString & name, int index, bool def ); @@ -90,7 +90,7 @@ class ResultSetMetaData : public: ResultSetMetaData( const ::rtl::Reference< RefCountedMutex > & reMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > & origin, + const css::uno::Reference< css::sdbc::XResultSet > & origin, ResultSet *pResultSet, ConnectionSettings **pSettings, PGresult *pResult, @@ -99,27 +99,27 @@ public: public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index 9deb552f2f89..7f3556d8c003 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -49,8 +49,8 @@ namespace pq_sdbc_driver { void SequenceResultSet::checkClosed() - throw ( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + throw ( css::sdbc::SQLException, + css::uno::RuntimeException ) { // we never close :o) } @@ -64,10 +64,10 @@ Any SequenceResultSet::getValue( sal_Int32 columnIndex ) SequenceResultSet::SequenceResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, const std::vector< OUString > &colNames, const std::vector< std::vector< Any > > &data, - const Reference< com::sun::star::script::XTypeConverter > & tc, + const Reference< css::script::XTypeConverter > & tc, const ColumnMetaDataVector *pVec) : BaseResultSet( mutex, owner, data.size(), colNames.size(), tc ), m_data(data ), @@ -85,18 +85,18 @@ SequenceResultSet::~SequenceResultSet() } void SequenceResultSet::close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { // a noop } Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { if( ! m_meta.is() ) { // Oh no, not again - throw ::com::sun::star::sdbc::SQLException( + throw css::sdbc::SQLException( "pq_sequenceresultset: no meta supported ", *this, // I did not find "IM001" in a specific standard, // but it seems to be used by other systems (such as ODBC) @@ -109,7 +109,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, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { // no need to guard, as all members are readonly ! for( int i = 0 ;i < m_fieldCount ; i ++ ) diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx index 5be338f0d386..9c169324d713 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx @@ -54,42 +54,42 @@ namespace pq_sdbc_driver class SequenceResultSet : public BaseResultSet { protected: - std::vector< std::vector< ::com::sun::star::uno::Any > > m_data; + std::vector< std::vector< css::uno::Any > > m_data; std::vector< OUString > m_columnNames; - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > m_meta; + css::uno::Reference< css::sdbc::XResultSetMetaData > m_meta; protected: /** mutex should be locked before called */ virtual void checkClosed() - throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) override; + throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override; /** unchecked, acquire mutex before calling */ - virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) override; + virtual css::uno::Any getValue( sal_Int32 columnIndex ) override; public: SequenceResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, const std::vector< OUString > &colNames, - const std::vector< std::vector< com::sun::star::uno::Any > > &data, - const com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > &tc, + const std::vector< std::vector< css::uno::Any > > &data, + const css::uno::Reference< css::script::XTypeConverter > &tc, const ColumnMetaDataVector *pVec = nullptr); virtual ~SequenceResultSet(); public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx index 627d988c6462..9b4ed4d8a9de 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx @@ -193,7 +193,7 @@ OUString SequenceResultSetMetaData::getColumnServiceName( sal_Int32 /* column */ } void SequenceResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw (css::sdbc::SQLException, css::uno::RuntimeException) { if( columnIndex < 1 || columnIndex > m_colCount ) { diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx index 7f1cf63f22b7..11066a9b1e30 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx @@ -46,13 +46,13 @@ namespace pq_sdbc_driver { class SequenceResultSetMetaData : - public ::cppu::WeakImplHelper< com::sun::star::sdbc::XResultSetMetaData > + public ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData > { ColumnMetaDataVector m_columnData; sal_Int32 m_colCount; void checkColumnIndex( sal_Int32 columnIndex ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw (css::sdbc::SQLException, css::uno::RuntimeException); public: SequenceResultSetMetaData( @@ -61,27 +61,27 @@ namespace pq_sdbc_driver public: // Methods - virtual sal_Int32 SAL_CALL getColumnCount( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 28c4c46504d3..113adb422c19 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -166,9 +166,9 @@ Statement::Statement( const ::rtl::Reference< RefCountedMutex > & refMutex, m_props[STATEMENT_QUERY_TIME_OUT] = makeAny( (sal_Int32)0 ); m_props[STATEMENT_MAX_ROWS] = makeAny( (sal_Int32)0 ); m_props[STATEMENT_RESULT_SET_CONCURRENCY] = makeAny( - com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY ); + css::sdbc::ResultSetConcurrency::READ_ONLY ); m_props[STATEMENT_RESULT_SET_TYPE] = makeAny( - com::sun::star::sdbc::ResultSetType::SCROLL_INSENSITIVE ); + css::sdbc::ResultSetType::SCROLL_INSENSITIVE ); } Statement::~Statement() @@ -263,7 +263,7 @@ Reference< XResultSet > Statement::executeQuery(const OUString& sql ) { raiseSQLException( sql, "not a query" ); } - return Reference< XResultSet > ( m_lastResultset, com::sun::star::uno::UNO_QUERY ); + return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 Statement::executeUpdate( const OUString& sql ) @@ -305,9 +305,9 @@ static void raiseSQLException( // returns the elements of the primary key of the given table -// static Sequence< Reference< com::sun::star::beans::XPropertySet > > lookupKeys( +// static Sequence< Reference< css::beans::XPropertySet > > lookupKeys( static std::vector< OUString > lookupKeys( - const Reference< com::sun::star::container::XNameAccess > &tables, + const Reference< css::container::XNameAccess > &tables, const OUString & table, OUString *pSchema, OUString *pTable, @@ -325,7 +325,7 @@ static std::vector< OUString > lookupKeys( Reference< XEnumerationAccess > enumerationAccess = Reference< XEnumerationAccess > ( tables, UNO_QUERY ); - Reference< com::sun::star::container::XEnumeration > enumeration = + Reference< css::container::XEnumeration > enumeration = enumerationAccess->createEnumeration(); while( enumeration->hasMoreElements() ) { @@ -388,7 +388,7 @@ static std::vector< OUString > lookupKeys( enumeration->nextElement() >>= set; sal_Int32 keyType = 0; if( (set->getPropertyValue( st.TYPE ) >>= keyType ) && - keyType == com::sun::star::sdbcx::KeyType::PRIMARY ) + keyType == css::sdbcx::KeyType::PRIMARY ) { Reference< XColumnsSupplier > columns( set, UNO_QUERY ); Reference< XIndexAccess > indexAccess = @@ -493,7 +493,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) extractSingleTableFromSelect( vec ), pSettings->encoding ); if( data->concurrency == - com::sun::star::sdbc::ResultSetConcurrency::UPDATABLE ) + css::sdbc::ResultSetConcurrency::UPDATABLE ) { OString aReason; if( sourceTable.getLength() ) @@ -815,7 +815,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert( if( query.getLength() ) { - Reference< com::sun::star::sdbc::XStatement > stmt = connection->createStatement(); + Reference< css::sdbc::XStatement > stmt = connection->createStatement(); ret = stmt->executeQuery( query ); } @@ -873,11 +873,11 @@ void Statement::clearWarnings( ) { } -Reference< ::com::sun::star::sdbc::XResultSetMetaData > Statement::getMetaData() +Reference< css::sdbc::XResultSetMetaData > Statement::getMetaData() throw (SQLException,RuntimeException, std::exception) { - Reference< com::sun::star::sdbc::XResultSetMetaData > ret; - Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); + Reference< css::sdbc::XResultSetMetaData > ret; + Reference< css::sdbc::XResultSetMetaDataSupplier > supplier( m_lastResultset, UNO_QUERY ); if( supplier.is() ) ret = supplier->getMetaData(); return ret; @@ -957,19 +957,19 @@ Reference < XPropertySetInfo > Statement::getPropertySetInfo() Reference< XResultSet > Statement::getResultSet( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { - return Reference< XResultSet > ( m_lastResultset, com::sun::star::uno::UNO_QUERY ); + return Reference< XResultSet > ( m_lastResultset, css::uno::UNO_QUERY ); } sal_Int32 Statement::getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return m_multipleResultUpdateCount; } sal_Bool Statement::getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return false; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx index a7fbceb03a45..e73b7a8b02fe 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.hxx +++ b/connectivity/source/drivers/postgresql/pq_statement.hxx @@ -62,22 +62,22 @@ static const sal_Int32 STATEMENT_RESULT_SET_TYPE = 8; #define STATEMENT_SIZE 9 -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XMultipleResults, - ::com::sun::star::sdbc::XGeneratedResultSet, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier +typedef ::cppu::WeakComponentImplHelper< css::sdbc::XStatement, + css::sdbc::XCloseable, + css::sdbc::XWarningsSupplier, + css::sdbc::XMultipleResults, + css::sdbc::XGeneratedResultSet, + css::sdbc::XResultSetMetaDataSupplier > Statement_BASE; class Statement : public Statement_BASE, public cppu::OPropertySetHelper { private: - com::sun::star::uno::Any m_props[STATEMENT_SIZE]; - com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_connection; + css::uno::Any m_props[STATEMENT_SIZE]; + css::uno::Reference< css::sdbc::XConnection > m_connection; ConnectionSettings *m_pSettings; - com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > m_lastResultset; + css::uno::Reference< css::sdbc::XCloseable > m_lastResultset; ::rtl::Reference< RefCountedMutex > m_refMutex; bool m_multipleResultAvailable; sal_Int32 m_multipleResultUpdateCount; @@ -91,93 +91,93 @@ public: * as long as a reference to paramenter con is held. */ Statement( const rtl::Reference< RefCountedMutex > & refMutex, - const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection> & con, + const css::uno::Reference< css::sdbc::XConnection> & con, struct ConnectionSettings *pSettings ); virtual ~Statement(); public: // XInterface virtual void SAL_CALL acquire() throw() override { Statement_BASE::acquire(); } virtual void SAL_CALL release() throw() override { Statement_BASE::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XCloseable virtual void SAL_CALL close( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL execute( const OUString& sql ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearWarnings( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const override; // XPropertySet - ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw(css::uno::RuntimeException, std::exception) override; public: // XGeneratedResultSet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getGeneratedValues( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getUpdateCount( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getMoreResults( ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // OComponentHelper virtual void SAL_CALL disposing() override; 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, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; private: - void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException); + void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException); void raiseSQLException( const OUString & sql, const char * errorMsg ) - throw ( com::sun::star::sdbc::SQLException ); + throw ( css::sdbc::SQLException ); }; @@ -188,18 +188,18 @@ struct CommandData sal_Int32 *pMultipleResultUpdateCount; bool *pMultipleResultAvailable; OUString *pLastTableInserted; - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > *pLastResultset; + css::uno::Reference< css::sdbc::XCloseable > *pLastResultset; OString *pLastQuery; ::rtl::Reference< RefCountedMutex > refMutex; - ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > owner; - ::com::sun::star::uno::Reference< com::sun::star::sdbcx::XTablesSupplier > tableSupplier; + css::uno::Reference< css::uno::XInterface > owner; + css::uno::Reference< css::sdbcx::XTablesSupplier > tableSupplier; sal_Int32 concurrency; }; bool executePostgresCommand( const OString & cmd, struct CommandData *data ); -com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > getGeneratedValuesFromLastInsert( +css::uno::Reference< css::sdbc::XResultSet > getGeneratedValuesFromLastInsert( ConnectionSettings *pConnectionSettings, - const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection, + const css::uno::Reference< css::sdbc::XConnection > &connection, sal_Int32 nLastOid, const OUString & lastTableInserted, const OString & lastQuery ); diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index b680934c7b9e..596122d16c6e 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -73,7 +73,7 @@ struct PropertyDef PropertyDef( const OUString &str, const Type &t ) : name( str ) , type( t ) {} OUString name; - com::sun::star::uno::Type type; + css::uno::Type type; }; struct PropertyDefEx : public PropertyDef @@ -184,7 +184,7 @@ Statics & getStatics() Type tString = cppu::UnoType<OUString>::get(); Type tInt = cppu::UnoType<sal_Int32>::get(); Type tBool = cppu::UnoType<bool>::get(); - Type tStringSequence = cppu::UnoType<com::sun::star::uno::Sequence< OUString >>::get(); + Type tStringSequence = cppu::UnoType<css::uno::Sequence< OUString >>::get(); // Table props set ImplementationStatics &ist = statics.refl.table; @@ -553,66 +553,66 @@ Statics & getStatics() // LEM TODO see if a refresh is needed; obtain automatically from pg_catalog.pg_type? BaseTypeDef baseTypeDefs[] = { - { "bool" , com::sun::star::sdbc::DataType::BOOLEAN }, - { "bytea", com::sun::star::sdbc::DataType::VARBINARY }, - { "char" , com::sun::star::sdbc::DataType::CHAR }, + { "bool" , css::sdbc::DataType::BOOLEAN }, + { "bytea", css::sdbc::DataType::VARBINARY }, + { "char" , css::sdbc::DataType::CHAR }, - { "int8" , com::sun::star::sdbc::DataType::BIGINT }, - { "serial8" , com::sun::star::sdbc::DataType::BIGINT }, + { "int8" , css::sdbc::DataType::BIGINT }, + { "serial8" , css::sdbc::DataType::BIGINT }, - { "int2" , com::sun::star::sdbc::DataType::SMALLINT }, + { "int2" , css::sdbc::DataType::SMALLINT }, - { "int4" , com::sun::star::sdbc::DataType::INTEGER }, -// { "regproc" , com::sun::star::sdbc::DataType::INTEGER }, -// { "oid" , com::sun::star::sdbc::DataType::INTEGER }, -// { "xid" , com::sun::star::sdbc::DataType::INTEGER }, -// { "cid" , com::sun::star::sdbc::DataType::INTEGER }, -// { "serial", com::sun::star::sdbc::DataType::INTEGER }, -// { "serial4", com::sun::star::sdbc::DataType::INTEGER }, + { "int4" , css::sdbc::DataType::INTEGER }, +// { "regproc" , css::sdbc::DataType::INTEGER }, +// { "oid" , css::sdbc::DataType::INTEGER }, +// { "xid" , css::sdbc::DataType::INTEGER }, +// { "cid" , css::sdbc::DataType::INTEGER }, +// { "serial", css::sdbc::DataType::INTEGER }, +// { "serial4", css::sdbc::DataType::INTEGER }, - { "text", com::sun::star::sdbc::DataType::LONGVARCHAR }, - { "bpchar", com::sun::star::sdbc::DataType::CHAR }, - { "varchar", com::sun::star::sdbc::DataType::VARCHAR }, + { "text", css::sdbc::DataType::LONGVARCHAR }, + { "bpchar", css::sdbc::DataType::CHAR }, + { "varchar", css::sdbc::DataType::VARCHAR }, - { "float4", com::sun::star::sdbc::DataType::REAL }, - { "float8", com::sun::star::sdbc::DataType::DOUBLE }, + { "float4", css::sdbc::DataType::REAL }, + { "float8", css::sdbc::DataType::DOUBLE }, - { "numeric", com::sun::star::sdbc::DataType::NUMERIC }, - { "decimal", com::sun::star::sdbc::DataType::DECIMAL }, + { "numeric", css::sdbc::DataType::NUMERIC }, + { "decimal", css::sdbc::DataType::DECIMAL }, - { "date", com::sun::star::sdbc::DataType::DATE }, - { "time", com::sun::star::sdbc::DataType::TIME }, - { "timestamp", com::sun::star::sdbc::DataType::TIMESTAMP }, + { "date", css::sdbc::DataType::DATE }, + { "time", css::sdbc::DataType::TIME }, + { "timestamp", css::sdbc::DataType::TIMESTAMP }, -// { "_bool" , com::sun::star::sdbc::DataType::ARRAY }, -// { "_bytea", com::sun::star::sdbc::DataType::ARRAY }, -// { "_char" , com::sun::star::sdbc::DataType::ARRAY }, +// { "_bool" , css::sdbc::DataType::ARRAY }, +// { "_bytea", css::sdbc::DataType::ARRAY }, +// { "_char" , css::sdbc::DataType::ARRAY }, -// { "_int8" , com::sun::star::sdbc::DataType::ARRAY }, -// { "_serial8" , com::sun::star::sdbc::DataType::ARRAY }, +// { "_int8" , css::sdbc::DataType::ARRAY }, +// { "_serial8" , css::sdbc::DataType::ARRAY }, -// { "_int2" , com::sun::star::sdbc::DataType::ARRAY }, +// { "_int2" , css::sdbc::DataType::ARRAY }, -// { "_int4" , com::sun::star::sdbc::DataType::ARRAY }, -// { "_regproc" , com::sun::star::sdbc::DataType::ARRAY }, -// { "_oid" , com::sun::star::sdbc::DataType::ARRAY }, -// { "_xid" , com::sun::star::sdbc::DataType::ARRAY }, -// { "_cid" , com::sun::star::sdbc::DataType::ARRAY }, +// { "_int4" , css::sdbc::DataType::ARRAY }, +// { "_regproc" , css::sdbc::DataType::ARRAY }, +// { "_oid" , css::sdbc::DataType::ARRAY }, +// { "_xid" , css::sdbc::DataType::ARRAY }, +// { "_cid" , css::sdbc::DataType::ARRAY }, -// { "_text", com::sun::star::sdbc::DataType::ARRAY }, -// { "_bpchar", com::sun::star::sdbc::DataType::ARRAY }, -// { "_varchar", com::sun::star::sdbc::DataType::ARRAY }, +// { "_text", css::sdbc::DataType::ARRAY }, +// { "_bpchar", css::sdbc::DataType::ARRAY }, +// { "_varchar", css::sdbc::DataType::ARRAY }, -// { "_float4", com::sun::star::sdbc::DataType::ARRAY }, -// { "_float8", com::sun::star::sdbc::DataType::ARRAY }, +// { "_float4", css::sdbc::DataType::ARRAY }, +// { "_float8", css::sdbc::DataType::ARRAY }, -// { "_numeric", com::sun::star::sdbc::DataType::ARRAY }, -// { "_decimal", com::sun::star::sdbc::DataType::ARRAY }, +// { "_numeric", css::sdbc::DataType::ARRAY }, +// { "_decimal", css::sdbc::DataType::ARRAY }, -// { "_date", com::sun::star::sdbc::DataType::ARRAY }, // switch to date later -// { "_time", com::sun::star::sdbc::DataType::ARRAY }, // switch to time later +// { "_date", css::sdbc::DataType::ARRAY }, // switch to date later +// { "_time", css::sdbc::DataType::ARRAY }, // switch to time later { nullptr, 0 } }; @@ -625,28 +625,28 @@ Statics & getStatics() } // This is the metadata for the columns of the recordset returned - // by ::com::sun::star::sdbc::XDatabaseMetaData::getTypeInfo(), + // by css::sdbc::XDatabaseMetaData::getTypeInfo(), // that is what is returned by getTypeInfo().getMetaData() DefColumnMetaData defTypeInfoMetaData[] = { - { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 0 - { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 1 - { "PRECISION", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 2 - { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 3 - { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 4 - { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 5 - { "NULLABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 6 - { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 7 - { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 8 - { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 9 - { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 10 - { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 11 - { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 12 - { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false}, // 13 - { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 14 - { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 15 - { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false}, // 16 - { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 17 + { "TYPE_NAME", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 0 + { "DATA_TYPE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 1 + { "PRECISION", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 2 + { "LITERAL_PREFIX", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 3 + { "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 4 + { "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 5 + { "NULLABLE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 6 + { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 7 + { "SEARCHABLE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 8 + { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 9 + { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 10 + { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::BOOLEAN, 0,50,false,false,false }, // 11 + { "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::VARCHAR, 0,50,false,false,false }, // 12 + { "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::SMALLINT, 0,50,false,false,false}, // 13 + { "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::SMALLINT, 0,50,false,false,false }, // 14 + { "SQL_DATA_TYPE", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 15 + { "SQL_DATETIME_SUB", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::INTEGER, 0,50,false,false,false}, // 16 + { "NUM_PREC_RADIX", "TYPEINFO", "pg_catalog", "", css::sdbc::DataType::INTEGER, 0,50,false,false,false }, // 17 {nullptr,nullptr,nullptr,nullptr,0,0,0,false,false,false} }; diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index afc2a56301b4..b79df17349f5 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -102,9 +102,9 @@ struct ImplementationStatics {} OUString implName; - com::sun::star::uno::Sequence< OUString > serviceNames; + css::uno::Sequence< OUString > serviceNames; cppu::IPropertyArrayHelper *pProps; - com::sun::star::uno::Sequence< com::sun::star::uno::Type > types; + css::uno::Sequence< css::uno::Type > types; }; struct ReflectionImplementations @@ -228,7 +228,7 @@ struct Statics std::vector< OUString > typeinfoColumnNames; std::vector< OUString > indexinfoColumnNames; std::vector< OUString > resultSetArrayColumnNames; - std::vector< std::vector< com::sun::star::uno::Any > > tableTypeData; + std::vector< std::vector< css::uno::Any > > tableTypeData; ColumnMetaDataVector typeInfoMetaData; BaseTypeMap baseTypeMap; diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index df51a3b62aa0..d698287e23a0 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -224,14 +224,14 @@ sal_Int32 extractIntProperty( return ret; } -void disposeObject( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ) +void disposeObject( const css::uno::Reference< css::uno::XInterface > & r ) { Reference< XComponent > comp( r, UNO_QUERY ); if( comp.is() ) comp->dispose(); } -void disposeNoThrow( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ) +void disposeNoThrow( const css::uno::Reference< css::uno::XInterface > & r ) { try { @@ -248,18 +248,18 @@ Reference< XConnection > extractConnectionFromStatement( const Reference< XInter { Reference< XConnection > ret; - Reference< com::sun::star::sdbc::XStatement > owner( stmt, UNO_QUERY ); + Reference< css::sdbc::XStatement > owner( stmt, UNO_QUERY ); if( owner.is() ) ret = owner->getConnection(); else { - Reference< com::sun::star::sdbc::XPreparedStatement > myowner( stmt, UNO_QUERY ); + Reference< css::sdbc::XPreparedStatement > myowner( stmt, UNO_QUERY ); if( myowner.is() ) ret = myowner->getConnection(); if( ! ret.is() ) throw SQLException( "PQSDBC: Couldn't retrieve connection from statement", - Reference< XInterface > () , OUString(), 0 , com::sun::star::uno::Any() ); + Reference< XInterface > () , OUString(), 0 , css::uno::Any() ); } return ret; @@ -300,7 +300,7 @@ TransactionGuard::~TransactionGuard() if( ! m_commited ) m_stmt->executeUpdate( getStatics().ROLLBACK ); } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { // ignore, we are within a dtor } @@ -565,7 +565,7 @@ void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUSt } } -OUString array2String( const com::sun::star::uno::Sequence< Any > &seq ) +OUString array2String( const css::uno::Sequence< Any > &seq ) { OUStringBuffer buf(128); int len = seq.getLength(); @@ -711,7 +711,7 @@ std::vector< sal_Int32 > parseIntArray( const OUString & str ) void fillAttnum2attnameMap( Int2StringMap &map, - const Reference< com::sun::star::sdbc::XConnection > &conn, + const Reference< css::sdbc::XConnection > &conn, const OUString &schema, const OUString &table ) { @@ -838,9 +838,9 @@ OString extractSingleTableFromSelect( const OStringVector &vec ) } -com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ) +css::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ) { - com::sun::star::uno::Sequence< sal_Int32 > ret; + css::uno::Sequence< sal_Int32 > ret; const sal_Int32 strlen = str.getLength(); if( str.getLength() > 1 ) { @@ -893,7 +893,7 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str } while( true ); // vec is guaranteed non-empty assert(vec.size() > 0); - ret = com::sun::star::uno::Sequence< sal_Int32 > ( &vec[0] , vec.size() ); + ret = css::uno::Sequence< sal_Int32 > ( &vec[0] , vec.size() ); } return ret; } @@ -923,17 +923,17 @@ OUString sqltype2string( const Reference< XPropertySet > & desc ) { switch( extractIntProperty( desc, getStatics().TYPE ) ) { - case com::sun::star::sdbc::DataType::VARBINARY: - case com::sun::star::sdbc::DataType::VARCHAR: - case com::sun::star::sdbc::DataType::CHAR: + case css::sdbc::DataType::VARBINARY: + case css::sdbc::DataType::VARCHAR: + case css::sdbc::DataType::CHAR: { typeName.append( "(" ); typeName.append( precision ); typeName.append( ")" ); break; } - case com::sun::star::sdbc::DataType::DECIMAL: - case com::sun::star::sdbc::DataType::NUMERIC: + case css::sdbc::DataType::DECIMAL: + case css::sdbc::DataType::NUMERIC: { typeName.append( "(" ); typeName.append( precision ); @@ -952,23 +952,23 @@ OUString sqltype2string( const Reference< XPropertySet > & desc ) static void keyType2String( OUStringBuffer & buf, sal_Int32 keyType ) { - if( com::sun::star::sdbc::KeyRule::CASCADE == keyType ) + if( css::sdbc::KeyRule::CASCADE == keyType ) { buf.append( "CASCADE " ); } - else if( com::sun::star::sdbc::KeyRule::RESTRICT == keyType ) + else if( css::sdbc::KeyRule::RESTRICT == keyType ) { buf.append( "RESTRICT " ); } - else if( com::sun::star::sdbc::KeyRule::SET_DEFAULT == keyType ) + else if( css::sdbc::KeyRule::SET_DEFAULT == keyType ) { buf.append( "SET DEFAULT " ); } - else if( com::sun::star::sdbc::KeyRule::SET_NULL == keyType ) + else if( css::sdbc::KeyRule::SET_NULL == keyType ) { buf.append( "SET NULL " ); } - else //if( com::sun::star::sdbc::KeyRule::NO_ACTION == keyType ) + else //if( css::sdbc::KeyRule::NO_ACTION == keyType ) { buf.append( "NO ACTION " ); } @@ -983,15 +983,15 @@ void bufferKey2TableConstraint( sal_Int32 updateRule = extractIntProperty( key, st.UPDATE_RULE ); sal_Int32 deleteRule = extractIntProperty( key, st.DELETE_RULE ); bool foreign = false; - if( type == com::sun::star::sdbcx::KeyType::UNIQUE ) + if( type == css::sdbcx::KeyType::UNIQUE ) { buf.append( "UNIQUE( " ); } - else if( type == com::sun::star::sdbcx::KeyType::PRIMARY ) + else if( type == css::sdbcx::KeyType::PRIMARY ) { buf.append( "PRIMARY KEY( " ); } - else if( type == com::sun::star::sdbcx::KeyType::FOREIGN ) + else if( type == css::sdbcx::KeyType::FOREIGN ) { foreign = true; buf.append( "FOREIGN KEY( " ); @@ -1130,7 +1130,7 @@ void extractNameValuePairsFromInsert( String2StringMap & map, const OString & la } OUString querySingleValue( - const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection, + const css::uno::Reference< css::sdbc::XConnection > &connection, const OUString &query ) { OUString ret; @@ -1159,7 +1159,7 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, break; case typelib_TypeClass_VOID: - _rxParameters->setNull(_nColumnIndex,com::sun::star::sdbc::DataType::VARCHAR); + _rxParameters->setNull(_nColumnIndex,css::sdbc::DataType::VARCHAR); break; case typelib_TypeClass_STRING: @@ -1205,19 +1205,19 @@ bool implSetObject( const Reference< XParameters >& _rxParameters, bSuccessfullyReRouted = false; break; case typelib_TypeClass_STRUCT: - if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::DateTime>::get()) - _rxParameters->setTimestamp(_nColumnIndex, *static_cast<com::sun::star::util::DateTime const *>(_rValue.getValue())); - else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Date>::get()) - _rxParameters->setDate(_nColumnIndex, *static_cast<com::sun::star::util::Date const *>(_rValue.getValue())); - else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Time>::get()) - _rxParameters->setTime(_nColumnIndex, *static_cast<com::sun::star::util::Time const *>(_rValue.getValue())); + if (_rValue.getValueType() == cppu::UnoType<css::util::DateTime>::get()) + _rxParameters->setTimestamp(_nColumnIndex, *static_cast<css::util::DateTime const *>(_rValue.getValue())); + else if (_rValue.getValueType() == cppu::UnoType<css::util::Date>::get()) + _rxParameters->setDate(_nColumnIndex, *static_cast<css::util::Date const *>(_rValue.getValue())); + else if (_rValue.getValueType() == cppu::UnoType<css::util::Time>::get()) + _rxParameters->setTime(_nColumnIndex, *static_cast<css::util::Time const *>(_rValue.getValue())); else bSuccessfullyReRouted = false; break; case typelib_TypeClass_INTERFACE: { - Reference< com::sun::star::io::XInputStream > xStream; + Reference< css::io::XInputStream > xStream; if (_rValue >>= xStream) { _rValue >>= xStream; diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index 076f80bd95c9..6ab147c76d39 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -58,12 +58,12 @@ OUString concatQualified( const OUString & a, const OUString &b); OString OUStringToOString( const OUString& str, ConnectionSettings *settings); void bufferQuoteConstant( OUStringBuffer & buf, const OUString & str, ConnectionSettings *settings ); -void bufferQuoteAnyConstant( OUStringBuffer & buf, const com::sun::star::uno::Any &val, ConnectionSettings *settings ); +void bufferQuoteAnyConstant( OUStringBuffer & buf, const css::uno::Any &val, ConnectionSettings *settings ); void bufferEscapeConstant( OUStringBuffer & buf, const OUString & str, ConnectionSettings *settings ); OUString sqltype2string( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & column ); + const css::uno::Reference< css::beans::XPropertySet > & column ); void bufferQuoteQualifiedIdentifier( @@ -79,23 +79,23 @@ void bufferQuoteQualifiedIdentifier( void bufferQuoteIdentifier( OUStringBuffer & buf, const OUString &toQuote, ConnectionSettings *settings ); void bufferKey2TableConstraint( OUStringBuffer &buf, - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > &key, + const css::uno::Reference< css::beans::XPropertySet > &key, ConnectionSettings *settings ); OUString extractStringProperty( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, + const css::uno::Reference< css::beans::XPropertySet > & descriptor, const OUString &name ); sal_Int32 extractIntProperty( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, + const css::uno::Reference< css::beans::XPropertySet > & descriptor, const OUString &name ); bool extractBoolProperty( - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, + const css::uno::Reference< css::beans::XPropertySet > & descriptor, const OUString &name ); -void disposeNoThrow( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ); -void disposeObject( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ); +void disposeNoThrow( const css::uno::Reference< css::uno::XInterface > & r ); +void disposeObject( const css::uno::Reference< css::uno::XInterface > & r ); OUString extractTableFromInsert( const OUString & sql ); OString extractSingleTableFromSelect( const OStringVector &vec ); @@ -103,27 +103,27 @@ OString extractSingleTableFromSelect( const OStringVector &vec ); void tokenizeSQL( const OString & sql, OStringVector &vec ); void splitSQL( const OString & sql, OStringVector &vec ); std::vector< sal_Int32 > parseIntArray( const OUString & str ); -std::vector< com::sun::star::uno::Any > parseArray( const OUString & str ) - throw( com::sun::star::sdbc::SQLException ); +std::vector< css::uno::Any > parseArray( const OUString & str ) + throw( css::sdbc::SQLException ); -OUString array2String( const com::sun::star::uno::Sequence< com::sun::star::uno::Any > &seq ); +OUString array2String( const css::uno::Sequence< css::uno::Any > &seq ); -com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > extractConnectionFromStatement( - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & stmt ); +css::uno::Reference< css::sdbc::XConnection > extractConnectionFromStatement( + const css::uno::Reference< css::uno::XInterface > & stmt ); void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUString *second); void fillAttnum2attnameMap( Int2StringMap &map, - const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &conn, + const css::uno::Reference< css::sdbc::XConnection > &conn, const OUString &schema, const OUString &table ); -com::sun::star::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ); +css::uno::Sequence< sal_Int32 > string2intarray( const OUString & str ); -com::sun::star::uno::Sequence< OUString > convertMappedIntArray2StringArray( - const Int2StringMap &map, const com::sun::star::uno::Sequence< sal_Int32> &source ); +css::uno::Sequence< OUString > convertMappedIntArray2StringArray( + const Int2StringMap &map, const css::uno::Sequence< sal_Int32> &source ); typedef std::unordered_map < @@ -132,32 +132,32 @@ typedef std::unordered_map OStringHash > String2StringMap; OUString querySingleValue( - const com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &connection, + const css::uno::Reference< css::sdbc::XConnection > &connection, const OUString &query ); void extractNameValuePairsFromInsert( String2StringMap & map, const OString & lastQuery ); sal_Int32 typeNameToDataType( const OUString &typeName, const OUString &typtype ); // copied from connectivity/source/dbtools, can't use the function directly -bool implSetObject( const com::sun::star::uno::Reference< com::sun::star::sdbc::XParameters >& _rxParameters, - const sal_Int32 _nColumnIndex, const com::sun::star::uno::Any& _rValue); +bool implSetObject( const css::uno::Reference< css::sdbc::XParameters >& _rxParameters, + const sal_Int32 _nColumnIndex, const css::uno::Any& _rValue); class DisposeGuard { - com::sun::star::uno::Reference< com::sun::star::uno::XInterface > d; + css::uno::Reference< css::uno::XInterface > d; public: - explicit DisposeGuard(const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & r ); + explicit DisposeGuard(const css::uno::Reference< css::uno::XInterface > & r ); ~DisposeGuard(); }; class TransactionGuard { - com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > m_stmt; + css::uno::Reference< css::sdbc::XStatement > m_stmt; bool m_commited; public: /// takes over ownership of given statement - explicit TransactionGuard( const com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > &stmt ); + explicit TransactionGuard( const css::uno::Reference< css::sdbc::XStatement > &stmt ); ~TransactionGuard( ); void commit(); diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index 5934f94fa228..6a9e2d83e26c 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -83,9 +83,9 @@ namespace pq_sdbc_driver { -com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > UpdateableResultSet::createFromPGResultSet( +css::uno::Reference< css::sdbc::XCloseable > UpdateableResultSet::createFromPGResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, ConnectionSettings **ppSettings, PGresult *result, const OUString &schema, @@ -133,9 +133,9 @@ com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > UpdateableRes return ret; } -com::sun::star::uno::Any UpdateableResultSet::queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any UpdateableResultSet::queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) { Any ret = SequenceResultSet::queryInterface( reqType ); if( ! ret.hasValue() ) @@ -147,8 +147,8 @@ 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, std::exception ) +css::uno::Sequence< css::uno::Type > UpdateableResultSet::getTypes() + throw( css::uno::RuntimeException, std::exception ) { static cppu::OTypeCollection *pCollection; if( ! pCollection ) @@ -167,8 +167,8 @@ 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, std::exception ) +css::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationId() + throw( css::uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -483,7 +483,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, std::exception) +void UpdateableResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (SQLException, RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); checkClosed(); @@ -505,47 +505,47 @@ 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, std::exception) +void UpdateableResultSet::updateDate( sal_Int32 columnIndex, const css::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, std::exception) +void UpdateableResultSet::updateTime( sal_Int32 columnIndex, const css::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, std::exception) +void UpdateableResultSet::updateTimestamp( sal_Int32 columnIndex, const css::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, std::exception) +void UpdateableResultSet::updateBinaryStream( sal_Int32 /* columnIndex */, const css::uno::Reference< css::io::XInputStream >& /* x */, sal_Int32 /* length */ ) throw (SQLException, RuntimeException, std::exception) { } -void UpdateableResultSet::updateCharacterStream( sal_Int32 /* columnIndex */, const ::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 css::uno::Reference< css::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, std::exception) +void UpdateableResultSet::updateObject( sal_Int32 /* columnIndex */, const css::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, std::exception) +void UpdateableResultSet::updateNumericObject( sal_Int32 /* columnIndex */, const css::uno::Any& /* x */, sal_Int32 /* scale */ ) throw (SQLException, RuntimeException, std::exception) { } Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable ) - throw( com::sun::star::uno::RuntimeException ) + throw( css::uno::RuntimeException ) { if( updateable ) { cppu::OTypeCollection collection( cppu::UnoType<XResultSetUpdate>::get(), cppu::UnoType<XRowUpdate>::get(), -// cppu::UnoType<com::sun::star::sdbcx::XRowLocate>::get(), +// cppu::UnoType<css::sdbcx::XRowLocate>::get(), getStaticTypes( false /* updateable */ ) ); return collection.getTypes(); } @@ -560,10 +560,10 @@ Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable ) cppu::UnoType<XPropertySet>::get(), cppu::UnoType<XFastPropertySet>::get(), cppu::UnoType<XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::lang::XComponent>::get(), // OComponentHelper - cppu::UnoType<com::sun::star::lang::XTypeProvider>::get(), - cppu::UnoType<com::sun::star::uno::XAggregation>::get(), - cppu::UnoType<com::sun::star::uno::XWeak>::get()); + cppu::UnoType<css::lang::XComponent>::get(), // OComponentHelper + cppu::UnoType<css::lang::XTypeProvider>::get(), + cppu::UnoType<css::uno::XAggregation>::get(), + cppu::UnoType<css::uno::XWeak>::get()); return collection.getTypes(); } } diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index 2181efd664b6..7db28ca314a5 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -54,7 +54,7 @@ struct UpdateableField UpdateableField( ) : isTouched(false) {} - com::sun::star::uno::Any value; + css::uno::Any value; bool isTouched; }; @@ -62,8 +62,8 @@ typedef ::std::vector< UpdateableField > UpdateableFieldVector; class UpdateableResultSet : public SequenceResultSet, - public com::sun::star::sdbc::XResultSetUpdate, - public com::sun::star::sdbc::XRowUpdate + public css::sdbc::XResultSetUpdate, + public css::sdbc::XRowUpdate { ConnectionSettings **m_ppSettings; OUString m_schema; @@ -75,9 +75,9 @@ class UpdateableResultSet : protected: UpdateableResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, const std::vector< OUString > &colNames, - const std::vector< std::vector< com::sun::star::uno::Any > > &data, + const std::vector< std::vector< css::uno::Any > > &data, ConnectionSettings **ppSettings, const OUString &schema, const OUString &table, @@ -97,25 +97,25 @@ protected: // Positioned update/delete not supported, so no cursor name // Fetch direction and size are cursor-specific things, so not used now. // Fetch size not set - m_props[ BASERESULTSET_FETCH_DIRECTION ] = com::sun::star::uno::makeAny( - com::sun::star::sdbc::FetchDirection::UNKNOWN); + m_props[ BASERESULTSET_FETCH_DIRECTION ] = css::uno::makeAny( + css::sdbc::FetchDirection::UNKNOWN); // No escape processing for now m_props[ BASERESULTSET_ESCAPE_PROCESSING ] <<= false; // Bookmarks not implemented for now m_props[ BASERESULTSET_IS_BOOKMARKABLE ] <<= false; - m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] = com::sun::star::uno::makeAny( - com::sun::star::sdbc::ResultSetConcurrency::UPDATABLE ); - m_props[ BASERESULTSET_RESULT_SET_TYPE ] = com::sun::star::uno::makeAny( - com::sun::star::sdbc::ResultSetType::SCROLL_INSENSITIVE ); + m_props[ BASERESULTSET_RESULT_SET_CONCURRENCY ] = css::uno::makeAny( + css::sdbc::ResultSetConcurrency::UPDATABLE ); + m_props[ BASERESULTSET_RESULT_SET_TYPE ] = css::uno::makeAny( + css::sdbc::ResultSetType::SCROLL_INSENSITIVE ); } OUString buildWhereClause(); void checkUpdate( sal_Int32 column ); public: - static com::sun::star::uno::Reference< com::sun::star::sdbc::XCloseable > createFromPGResultSet( + static css::uno::Reference< css::sdbc::XCloseable > createFromPGResultSet( const ::rtl::Reference< RefCountedMutex > & mutex, - const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &owner, + const css::uno::Reference< css::uno::XInterface > &owner, ConnectionSettings **ppSettings, PGresult *result, const OUString &schema, @@ -125,47 +125,47 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { SequenceResultSet::acquire(); } virtual void SAL_CALL release() throw() override { SequenceResultSet::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XTypeProvider - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deleteRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancelRowUpdates( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL moveToInsertRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL moveToCurrentRow( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; - 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) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: - static com::sun::star::uno::Sequence< com::sun::star::uno::Type > getStaticTypes( bool updateable ) - throw( com::sun::star::uno::RuntimeException ); + static css::uno::Sequence< css::uno::Type > getStaticTypes( bool updateable ) + throw( css::uno::RuntimeException ); }; diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index 733b32bf399d..45f37fe0430c 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -59,9 +59,9 @@ namespace pq_sdbc_driver ReflectionBase::ReflectionBase( const OUString &implName, - const ::com::sun::star::uno::Sequence< OUString > &supportedServices, + const css::uno::Sequence< OUString > &supportedServices, const ::rtl::Reference< RefCountedMutex >& refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &conn, + const css::uno::Reference< css::sdbc::XConnection > &conn, ConnectionSettings *pSettings, cppu::IPropertyArrayHelper & props /* must survive this object !*/ ) : ReflectionBase_BASE( refMutex->mutex ), @@ -81,11 +81,11 @@ cppu::IPropertyArrayHelper & ReflectionBase::getInfoHelper() } sal_Bool ReflectionBase::convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) { rOldValue = m_values[nHandle]; @@ -95,7 +95,7 @@ sal_Bool ReflectionBase::convertFastPropertyValue( } void ReflectionBase::setPropertyValue_NoBroadcast_public( - const OUString & name, const com::sun::star::uno::Any & value ) + const OUString & name, const css::uno::Any & value ) { sal_Int32 nHandle = m_propsDesc.getHandleByName( name ); if( -1 == nHandle ) @@ -105,15 +105,15 @@ void ReflectionBase::setPropertyValue_NoBroadcast_public( buf.append( name ); buf.append( "' in " ); buf.append( m_implName ); - throw com::sun::star::uno::RuntimeException( buf.makeStringAndClear() , *this ); + throw css::uno::RuntimeException( buf.makeStringAndClear() , *this ); } setFastPropertyValue_NoBroadcast( nHandle , value ); } void ReflectionBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) { // OUString s; // rValue >>= s; @@ -123,7 +123,7 @@ void ReflectionBase::setFastPropertyValue_NoBroadcast( } void ReflectionBase::getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const { rValue = m_values[nHandle]; @@ -134,36 +134,36 @@ void ReflectionBase::getFastPropertyValue( } -Reference < ::com::sun::star::beans::XPropertySetInfo > ReflectionBase::getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException, std::exception) +Reference < css::beans::XPropertySetInfo > ReflectionBase::getPropertySetInfo() + throw(css::uno::RuntimeException, std::exception) { return OPropertySetHelper::createPropertySetInfo( m_propsDesc ); } OUString ReflectionBase::getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return m_implName; } sal_Bool ReflectionBase::supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > ReflectionBase::getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return m_supportedServices; } -Sequence< com::sun::star::uno::Type > ReflectionBase::getTypes() - throw( com::sun::star::uno::RuntimeException, std::exception ) +Sequence< css::uno::Type > ReflectionBase::getTypes() + throw( css::uno::RuntimeException, std::exception ) { osl::MutexGuard guard( m_refMutex->mutex ); - static Sequence< ::com::sun::star::uno::Type > collection( + static Sequence< css::uno::Type > collection( ::comphelper::concatSequences( ::cppu::OPropertySetHelper::getTypes(), ReflectionBase_BASE::getTypes() ) ); @@ -171,9 +171,9 @@ 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, std::exception) +css::uno::Any ReflectionBase::queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) { Any ret = ReflectionBase_BASE::queryInterface( reqType ); return ret.hasValue() ? ret : OPropertySetHelper::queryInterface( reqType ); @@ -202,7 +202,7 @@ void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set ) } } -OUString ReflectionBase::getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString ReflectionBase::getName( ) throw (css::uno::RuntimeException, std::exception) { Statics & st = getStatics(); if( getInfoHelper().hasPropertyByName( st.SCHEMA_NAME ) ) @@ -215,7 +215,7 @@ OUString ReflectionBase::getName( ) throw (::com::sun::star::uno::RuntimeExcept void ReflectionBase::setName( const OUString& /* aName */ ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { throw RuntimeException( "pq_sdbc::ReflectionBase::setName not implemented", diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx index c30503ba0503..17e2e0f70455 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -48,9 +48,9 @@ namespace pq_sdbc_driver { -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::sdbcx::XDataDescriptorFactory, - ::com::sun::star::container::XNamed +typedef ::cppu::WeakComponentImplHelper< css::lang::XServiceInfo, + css::sdbcx::XDataDescriptorFactory, + css::container::XNamed > ReflectionBase_BASE; class ReflectionBase : @@ -59,81 +59,81 @@ class ReflectionBase : { protected: const OUString m_implName; - const ::com::sun::star::uno::Sequence< OUString > m_supportedServices; + const css::uno::Sequence< OUString > m_supportedServices; ::rtl::Reference< RefCountedMutex > m_refMutex; - ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_conn; + css::uno::Reference< css::sdbc::XConnection > m_conn; ConnectionSettings *m_pSettings; cppu::IPropertyArrayHelper & m_propsDesc; - std::vector< com::sun::star::uno::Any > m_values; + std::vector< css::uno::Any > m_values; public: ReflectionBase( const OUString &implName, - const ::com::sun::star::uno::Sequence< OUString > &supportedServices, + const css::uno::Sequence< OUString > &supportedServices, const ::rtl::Reference< RefCountedMutex >& refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > &conn, + const css::uno::Reference< css::sdbc::XConnection > &conn, ConnectionSettings *pSettings, cppu::IPropertyArrayHelper & props /* must survive this object !*/ ); public: - void copyValuesFrom( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > &set ); + void copyValuesFrom( const css::uno::Reference< css::beans::XPropertySet > &set ); public: // for initialization purposes only, not exported via an interface ! void setPropertyValue_NoBroadcast_public( - const OUString & name, const com::sun::star::uno::Any & value ); + const OUString & name, const css::uno::Any & value ); public: //XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase_BASE::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase_BASE::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // OPropertySetHelper virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual sal_Bool SAL_CALL convertFastPropertyValue( - ::com::sun::star::uno::Any & rConvertedValue, - ::com::sun::star::uno::Any & rOldValue, + css::uno::Any & rConvertedValue, + css::uno::Any & rOldValue, sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) + throw (css::uno::Exception, std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const override; // XPropertySet - ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw(com::sun::star::uno::RuntimeException, std::exception) override; + css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() + throw(css::uno::RuntimeException, std::exception) override; public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override = 0; public: // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index 81e243b053eb..f8c3c2747aef 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -46,7 +46,7 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.column.implName, @@ -67,7 +67,7 @@ Reference< XPropertySet > Column::createDataDescriptor( ) throw (RuntimeExcepti ColumnDescriptor::ColumnDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.columnDescriptor.implName, diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx index 7917b14cede0..3b833845f4f0 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.hxx @@ -53,12 +53,12 @@ class Column : public ReflectionBase { public: Column( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -67,12 +67,12 @@ class ColumnDescriptor : public ReflectionBase public: ColumnDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx index cf97b369d991..bddd974f6b26 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx @@ -104,7 +104,7 @@ static Any isAutoIncrement( const OUString & defaultValue ) Columns::Columns( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName) @@ -117,7 +117,7 @@ Columns::~Columns() {} OUString columnMetaData2SDBCX( - ReflectionBase *pBase, const com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > &xRow ) + ReflectionBase *pBase, const css::uno::Reference< css::sdbc::XRow > &xRow ) { Statics & st = getStatics(); @@ -226,7 +226,7 @@ OUString columnMetaData2SDBCX( // class CommentChanger : public cppu::WeakImplHelper< XPropertyChangeListener > // { // ::rtl::Reference< RefCountedMutex > m_refMutex; -// ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > m_connection; +// css::uno::Reference< css::sdbc::XConnection > m_connection; // ConnectionSettings *m_pSettings; // OUString m_schema; // OUString m_table; @@ -235,7 +235,7 @@ OUString columnMetaData2SDBCX( // public: // CommentChanger( // const ::rtl::Reference< RefCountedMutex > & refMutex, -// const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, +// const css::uno::Reference< css::sdbc::XConnection > & connection, // ConnectionSettings *pSettings, // const OUString & schema, // const OUString & table, @@ -250,13 +250,13 @@ OUString columnMetaData2SDBCX( // // Methods -// virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) +// virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) // { // osl::MutexGuard guard( m_refMutex->mutex ); // m_connection.clear(); // } // // Methods -// virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException) +// virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException) // { // osl::MutexGuard guard( m_refMutex->mutex ); // OUStringBuffer buf( 128 ); @@ -276,7 +276,7 @@ OUString columnMetaData2SDBCX( // }; void Columns::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -308,7 +308,7 @@ void Columns::refresh() { Column * pColumn = new Column( m_refMutex, m_origin, m_pSettings ); - Reference< com::sun::star::beans::XPropertySet > prop = pColumn; + Reference< css::beans::XPropertySet > prop = pColumn; OUString name = columnMetaData2SDBCX( pColumn, xRow ); // pColumn->addPropertyChangeListener( @@ -329,7 +329,7 @@ void Columns::refresh() } m_name2index.swap( map ); } - catch ( com::sun::star::sdbc::SQLException & e ) + catch ( css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -342,8 +342,8 @@ void alterColumnByDescriptor( const OUString & tableName, ConnectionSettings *settings, const Reference< XStatement > &stmt, - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & past, - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & future) + const css::uno::Reference< css::beans::XPropertySet > & past, + const css::uno::Reference< css::beans::XPropertySet > & future) { Statics & st = getStatics(); @@ -427,7 +427,7 @@ void alterColumnByDescriptor( bufferQuoteQualifiedIdentifier( buf, schemaName, tableName, settings ); buf.append( "ALTER COLUMN" ); bufferQuoteIdentifier( buf, futureColumnName, settings ); - if( futureNullable == com::sun::star::sdbc::ColumnValue::NO_NULLS ) + if( futureNullable == css::sdbc::ColumnValue::NO_NULLS ) { buf.append( "SET" ); } @@ -460,15 +460,15 @@ void alterColumnByDescriptor( } 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& future ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); Reference< XPropertySet > past = createDataDescriptor(); - past->setPropertyValue( st.IS_NULLABLE, makeAny( com::sun::star::sdbc::ColumnValue::NULLABLE ) ); + past->setPropertyValue( st.IS_NULLABLE, makeAny( css::sdbc::ColumnValue::NULLABLE ) ); alterColumnByDescriptor( m_schemaName, m_tableName, m_pSettings, m_origin->createStatement() , past, future ); @@ -476,9 +476,9 @@ void Columns::appendByDescriptor( } // void Columns::dropByName( const OUString& elementName ) -// throw (::com::sun::star::sdbc::SQLException, -// ::com::sun::star::container::NoSuchElementException, -// ::com::sun::star::uno::RuntimeException) +// throw (css::sdbc::SQLException, +// css::container::NoSuchElementException, +// css::uno::RuntimeException) // { // String2IntMap::const_iterator ii = m_name2index.find( elementName ); // if( ii == m_name2index.end() ) @@ -491,16 +491,16 @@ void Columns::appendByDescriptor( // buf.appendAscii( "." ); // buf.append( m_tableName ); // buf.appendAscii( ", so it can't be dropped" ); -// throw com::sun::star::container::NoSuchElementException( +// throw css::container::NoSuchElementException( // buf.makeStringAndClear(), *this ); // } // dropByIndex( ii->second ); // } void Columns::dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -511,7 +511,7 @@ void Columns::dropByIndex( sal_Int32 index ) buf.append( ", got " ); buf.append( index ); buf.append( ")" ); - throw com::sun::star::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); } @@ -534,15 +534,15 @@ void Columns::dropByIndex( sal_Int32 index ) } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Columns::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > Columns::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XNameAccess > Columns::create( +Reference< css::container::XNameAccess > Columns::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, @@ -550,7 +550,7 @@ Reference< com::sun::star::container::XNameAccess > Columns::create( { *ppColumns = new Columns( refMutex, origin, pSettings, schemaName, tableName ); - Reference< com::sun::star::container::XNameAccess > ret = *ppColumns; + Reference< css::container::XNameAccess > ret = *ppColumns; (*ppColumns)->refresh(); return ret; @@ -559,14 +559,14 @@ Reference< com::sun::star::container::XNameAccess > Columns::create( ColumnDescriptors::ColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ) : Container( refMutex, origin, pSettings, "COLUMN-DESCRIPTOR" ) {} -Reference< ::com::sun::star::beans::XPropertySet > ColumnDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< css::beans::XPropertySet > ColumnDescriptors::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new ColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx index 5daeeb296684..9e5911d0fd2d 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumns.hxx @@ -49,12 +49,12 @@ void alterColumnByDescriptor( const OUString & schemaName, const OUString & tableName, ConnectionSettings *settings, - const com::sun::star::uno::Reference< com::sun::star::sdbc::XStatement > &stmt, - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & past, - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & future); + const css::uno::Reference< css::sdbc::XStatement > &stmt, + const css::uno::Reference< css::beans::XPropertySet > & past, + const css::uno::Reference< css::beans::XPropertySet > & future); OUString columnMetaData2SDBCX( - ReflectionBase *pBase, const com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > &xRow ); + ReflectionBase *pBase, const css::uno::Reference< css::sdbc::XRow > &xRow ); class Columns : public Container { @@ -62,9 +62,9 @@ class Columns : public Container OUString m_tableName; public: // instances Columns 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, @@ -73,7 +73,7 @@ public: // instances Columns 'exception safe' protected: Columns( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName); @@ -83,27 +83,27 @@ protected: public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; // 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); +// throw (css::sdbc::SQLException, +// css::container::NoSuchElementException, +// css::uno::RuntimeException); virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; @@ -112,12 +112,12 @@ class ColumnDescriptors : public Container public: ColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx index 2f92174be32a..cc46f7ae93ec 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx @@ -134,7 +134,7 @@ public: Container::Container( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &type) : ContainerBase( refMutex->mutex ), @@ -164,7 +164,7 @@ Any Container::getByName( const OUString& aName ) } Sequence< OUString > Container::getElementNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { Sequence< OUString > ret( m_values.size() ); for( String2IntMap::const_iterator ii = m_name2index.begin(); @@ -179,27 +179,27 @@ Sequence< OUString > Container::getElementNames( ) } sal_Bool Container::hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return m_name2index.find( aName ) != m_name2index.end(); } // Methods Type Container::getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return Type(); } sal_Bool Container::hasElements( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return ! m_name2index.empty(); } Any Container::getByIndex( sal_Int32 Index ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { if( Index < 0 || Index >= (sal_Int32)m_values.size() ) { @@ -216,7 +216,7 @@ Any Container::getByIndex( sal_Int32 Index ) } sal_Int32 Container::getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return m_values.size(); } @@ -224,10 +224,10 @@ sal_Int32 Container::getCount() class ContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { - std::vector< com::sun::star::uno::Any > m_vec; + std::vector< css::uno::Any > m_vec; sal_Int32 m_index; public: - explicit ContainerEnumeration( const std::vector< com::sun::star::uno::Any > &vec ) + explicit ContainerEnumeration( const std::vector< css::uno::Any > &vec ) : m_vec( vec ), m_index( -1 ) {} @@ -235,24 +235,24 @@ public: public: // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL nextElement( ) + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; }; sal_Bool ContainerEnumeration::hasMoreElements() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return (int)m_vec.size() > m_index +1; } -com::sun::star::uno::Any ContainerEnumeration::nextElement() - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any ContainerEnumeration::nextElement() + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) { if( ! hasMoreElements() ) { @@ -264,21 +264,21 @@ com::sun::star::uno::Any ContainerEnumeration::nextElement() } Reference< XEnumeration > Container::createEnumeration( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::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, std::exception) + const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l ); } void Container::removeRefreshListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l ); } @@ -307,9 +307,9 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); String2IntMap::const_iterator ii = m_name2index.find( elementName ); @@ -325,16 +325,16 @@ void Container::dropByName( const OUString& elementName ) // buf.appendAscii( "." ); // buf.append( m_tableName ); buf.append( " container, so it can't be dropped" ); - throw com::sun::star::container::NoSuchElementException( + throw css::container::NoSuchElementException( buf.makeStringAndClear(), *this ); } dropByIndex( ii->second ); } void Container::dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >=(sal_Int32)m_values.size() ) @@ -346,7 +346,7 @@ void Container::dropByIndex( sal_Int32 index ) buf.append( index ); buf.append( ") in " ); buf.append( m_type ); - throw com::sun::star::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); } @@ -386,8 +386,8 @@ void Container::dropByIndex( sal_Int32 index ) void Container::append( const OUString & name, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) - throw ( ::com::sun::star::container::ElementExistException ) + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw ( css::container::ElementExistException ) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -400,7 +400,7 @@ void Container::append( buf.append( " with name " ); buf.append( name ); buf.append( " already exists in this container" ); - throw com::sun::star::container::ElementExistException( + throw css::container::ElementExistException( buf.makeStringAndClear() , *this ); } @@ -412,25 +412,25 @@ void Container::append( } 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& descriptor) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { append( extractStringProperty( descriptor, getStatics().NAME ), descriptor ); } void Container::addContainerListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::container::XContainerListener >& l ) + throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType<decltype(l)>::get() , l ); } void Container::removeContainerListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + const css::uno::Reference< css::container::XContainerListener >& l ) + throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType<decltype(l)>::get() , l ); } @@ -438,7 +438,7 @@ void Container::removeContainerListener( void Container::fire( const EventBroadcastHelper &helper ) { - Reference< ::com::sun::star::util::XRefreshListener > l; + Reference< css::util::XRefreshListener > l; cppu::OInterfaceContainerHelper *container = rBHelper.getContainer( helper.getType() ); if( container ) { @@ -449,13 +449,13 @@ void Container::fire( const EventBroadcastHelper &helper ) { helper.fire( static_cast<XEventListener *>(iterator.next()) ); } - catch ( com::sun::star::uno::RuntimeException & ) + catch ( css::uno::RuntimeException & ) { OSL_ENSURE( false, "exception catched" ); // loose coupling, a runtime exception shall not break anything // TODO: log away as warning ! } - catch( com::sun::star::uno::Exception & ) + catch( css::uno::Exception & ) { OSL_ENSURE( false, "exception from listener flying through" ); throw; diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 281aeb87c077..e5589b1478f4 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -60,28 +60,28 @@ namespace pq_sdbc_driver class EventBroadcastHelper { public: - virtual void fire(com::sun::star::lang::XEventListener * listener) const = 0; - virtual com::sun::star::uno::Type getType() const = 0; + virtual void fire(css::lang::XEventListener * listener) const = 0; + virtual css::uno::Type getType() const = 0; virtual ~EventBroadcastHelper(){}; }; class RefreshedBroadcaster : public EventBroadcastHelper { - com::sun::star::lang::EventObject m_event; + css::lang::EventObject m_event; public: - explicit RefreshedBroadcaster(const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & source ) : + explicit RefreshedBroadcaster(const css::uno::Reference< css::uno::XInterface > & source ) : m_event( source ) {} - virtual void fire( com::sun::star::lang::XEventListener * listener ) const override + virtual void fire( css::lang::XEventListener * listener ) const override { - static_cast<com::sun::star::util::XRefreshListener*>(listener)->refreshed( m_event ); + static_cast<css::util::XRefreshListener*>(listener)->refreshed( m_event ); } - virtual com::sun::star::uno::Type getType() const override + virtual css::uno::Type getType() const override { return cppu::UnoType< - com::sun::star::util::XRefreshListener>::get(); + css::util::XRefreshListener>::get(); } }; @@ -94,14 +94,14 @@ typedef std::unordered_map typedef ::cppu::WeakComponentImplHelper < - com::sun::star::container::XNameAccess, - com::sun::star::container::XIndexAccess, - com::sun::star::container::XEnumerationAccess, - com::sun::star::sdbcx::XAppend, - com::sun::star::sdbcx::XDrop, - com::sun::star::util::XRefreshable, - com::sun::star::sdbcx::XDataDescriptorFactory, - com::sun::star::container::XContainer + css::container::XNameAccess, + css::container::XIndexAccess, + css::container::XEnumerationAccess, + css::sdbcx::XAppend, + css::sdbcx::XDrop, + css::util::XRefreshable, + css::sdbcx::XDataDescriptorFactory, + css::container::XContainer > ContainerBase; class /* abstract */ Container : public ContainerBase @@ -109,94 +109,94 @@ class /* abstract */ Container : public ContainerBase protected: ::rtl::Reference< RefCountedMutex > m_refMutex; ConnectionSettings *m_pSettings; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_origin; + css::uno::Reference< css::sdbc::XConnection > m_origin; String2IntMap m_name2index; // maps the element name to an index - std::vector< com::sun::star::uno::Any > m_values; // contains the real values + std::vector< css::uno::Any > m_values; // contains the real values OUString m_type; public: Container( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString & type // for exception messages ); public: // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) + throw (css::lang::IndexOutOfBoundsException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; public: // XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > - SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > + SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) override; 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, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) + throw (css::container::NoSuchElementException, + css::lang::WrappedTargetException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; // Methods - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; public: // XAppend // Must be overridden in Non-Descriptors. May be overridden in descriptors, when // PropertySet.NAME != container name virtual void SAL_CALL appendByDescriptor( - const ::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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; // helper method ! void append( const OUString & str, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) - throw ( ::com::sun::star::container::ElementExistException ); + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw ( css::container::ElementExistException ); 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, std::exception) override; + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override = 0; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override {} + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL addRefreshListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeRefreshListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XRefreshListener >& l ) + throw (css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XContainerListener >& xListener ) + throw (css::uno::RuntimeException, std::exception) override; public: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx index 55b53e9bfb9f..688d1d77a40c 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx @@ -63,7 +63,7 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings, const OUString & schemaName, const OUString & tableName ) @@ -87,7 +87,7 @@ Reference< XPropertySet > Index::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > Index::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > Index::getColumns( ) throw (css::uno::RuntimeException, std::exception) { if( ! m_indexColumns.is() ) { @@ -110,7 +110,7 @@ Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception ) if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(), + cppu::UnoType<css::sdbcx::XColumnsSupplier>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -131,14 +131,14 @@ Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std:: if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XColumnsSupplier * > ( this ) ); + static_cast< css::sdbcx::XColumnsSupplier * > ( this ) ); return ret; } IndexDescriptor::IndexDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) : ReflectionBase( getStatics().refl.indexDescriptor.implName, @@ -157,7 +157,7 @@ Reference< XPropertySet > IndexDescriptor::createDataDescriptor( ) throw (Runti return Reference< XPropertySet > ( pIndex ); } -Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > IndexDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) { if( ! m_indexColumns.is() ) { @@ -182,7 +182,7 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::except if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(), + cppu::UnoType<css::sdbcx::XColumnsSupplier>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -203,7 +203,7 @@ Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XColumnsSupplier * > ( this ) ); + static_cast< css::sdbcx::XColumnsSupplier * > ( this ) ); return ret; } diff --git a/connectivity/source/drivers/postgresql/pq_xindex.hxx b/connectivity/source/drivers/postgresql/pq_xindex.hxx index 23e9cc1c432b..89795324127c 100644 --- a/connectivity/source/drivers/postgresql/pq_xindex.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindex.hxx @@ -51,16 +51,16 @@ namespace pq_sdbc_driver { class Index : public ReflectionBase, - public com::sun::star::sdbcx::XColumnsSupplier + public css::sdbcx::XColumnsSupplier { - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexColumns; + css::uno::Reference< css::container::XNameAccess > m_indexColumns; OUString m_schemaName; OUString m_tableName; public: Index( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName); @@ -68,58 +68,58 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getColumns( ) throw (css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; class IndexDescriptor : public ReflectionBase, - public com::sun::star::sdbcx::XColumnsSupplier + public css::sdbcx::XColumnsSupplier { - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexColumns; + css::uno::Reference< css::container::XNameAccess > m_indexColumns; public: IndexDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getColumns( ) throw (css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx index c9f8e9334586..bb01c7f30423 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx @@ -46,7 +46,7 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { IndexColumn::IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) : ReflectionBase( getStatics().refl.indexColumn.implName, @@ -69,7 +69,7 @@ Reference< XPropertySet > IndexColumn::createDataDescriptor( ) throw (RuntimeEx IndexColumnDescriptor::IndexColumnDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) : ReflectionBase( getStatics().refl.indexColumnDescriptor.implName, diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx index fd528118e05d..42c249b64958 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx @@ -54,12 +54,12 @@ class IndexColumn : public ReflectionBase public: IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -68,12 +68,12 @@ class IndexColumnDescriptor : public ReflectionBase public: IndexColumnDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx index 303a8604cbf7..74e2d58ca263 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx @@ -73,12 +73,12 @@ namespace pq_sdbc_driver IndexColumns::IndexColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, const OUString &indexName, - const com::sun::star::uno::Sequence< OUString > &columns ) + const css::uno::Sequence< OUString > &columns ) : Container( refMutex, origin, pSettings, "INDEX_COLUMN" ), m_schemaName( schemaName ), m_tableName( tableName ), @@ -101,7 +101,7 @@ static sal_Int32 findInSequence( const Sequence< OUString > & seq , const OUStri } void IndexColumns::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -136,7 +136,7 @@ void IndexColumns::refresh() IndexColumn * pIndexColumn = new IndexColumn( m_refMutex, m_origin, m_pSettings ); - Reference< com::sun::star::beans::XPropertySet > prop = pIndexColumn; + Reference< css::beans::XPropertySet > prop = pIndexColumn; columnMetaData2SDBCX( pIndexColumn, xRow ); pIndexColumn->setPropertyValue_NoBroadcast_public( @@ -146,7 +146,7 @@ void IndexColumns::refresh() m_name2index[ columnName ] = index; } } - catch ( com::sun::star::sdbc::SQLException & e ) + catch ( css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -156,30 +156,30 @@ void IndexColumns::refresh() 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& /*future*/ ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { - throw com::sun::star::sdbc::SQLException( + throw css::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.appendByDescriptor not yet implemented", *this, OUString(), 1, Any() ); // osl::MutexGuard guard( m_refMutex->mutex ); // Statics & st = getStatics(); // Reference< XPropertySet > past = createDataDescriptor(); -// past->setPropertyValue( st.IS_NULLABLE, makeAny( com::sun::star::sdbc::ColumnValue::NULLABLE ) ); +// past->setPropertyValue( st.IS_NULLABLE, makeAny( css::sdbc::ColumnValue::NULLABLE ) ); // alterColumnByDescriptor( // m_schemaName, m_tableName, m_pSettings->encoding, m_origin->createStatement() , past, future ); } void IndexColumns::dropByName( const OUString& elementName ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { (void) elementName; - throw com::sun::star::sdbc::SQLException( + throw css::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.dropByName not yet implemented", *this, OUString(), 1, Any() ); // String2IntMap::const_iterator ii = m_name2index.find( elementName ); @@ -193,19 +193,19 @@ void IndexColumns::dropByName( const OUString& elementName ) // buf.appendAscii( "." ); // buf.append( m_tableName ); // buf.appendAscii( ", so it can't be dropped" ); -// throw com::sun::star::container::NoSuchElementException( +// throw css::container::NoSuchElementException( // buf.makeStringAndClear(), *this ); // } // dropByIndex( ii->second ); } void IndexColumns::dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { (void) index; - throw com::sun::star::sdbc::SQLException( + throw css::sdbc::SQLException( "SDBC-POSTGRESQL: IndexesColumns.dropByIndex not yet implemented", *this, OUString(), 1, Any() ); // osl::MutexGuard guard( m_refMutex->mutex ); @@ -217,7 +217,7 @@ void IndexColumns::dropByIndex( sal_Int32 index ) // buf.appendAscii( ", got " ); // buf.append( index ); // buf.appendAscii( ")" ); -// throw com::sun::star::lang::IndexOutOfBoundsException( +// throw css::lang::IndexOutOfBoundsException( // buf.makeStringAndClear(), *this ); // } @@ -239,15 +239,15 @@ void IndexColumns::dropByIndex( sal_Int32 index ) } -Reference< ::com::sun::star::beans::XPropertySet > IndexColumns::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< css::beans::XPropertySet > IndexColumns::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XNameAccess > IndexColumns::create( +Reference< css::container::XNameAccess > IndexColumns::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, @@ -256,7 +256,7 @@ Reference< com::sun::star::container::XNameAccess > IndexColumns::create( { IndexColumns *pIndexColumns = new IndexColumns( refMutex, origin, pSettings, schemaName, tableName, indexName, columns ); - Reference< com::sun::star::container::XNameAccess > ret = pIndexColumns; + Reference< css::container::XNameAccess > ret = pIndexColumns; pIndexColumns->refresh(); return ret; @@ -265,21 +265,21 @@ Reference< com::sun::star::container::XNameAccess > IndexColumns::create( IndexColumnDescriptors::IndexColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings) : Container( refMutex, origin, pSettings, getStatics().INDEX_COLUMN ) {} -Reference< com::sun::star::container::XNameAccess > IndexColumnDescriptors::create( +Reference< css::container::XNameAccess > IndexColumnDescriptors::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings) { return new IndexColumnDescriptors( refMutex, origin, pSettings ); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > IndexColumnDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > IndexColumnDescriptors::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new IndexColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx index 0c0ad0b9c6df..55c5833ad8af 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx @@ -47,53 +47,53 @@ class IndexColumns : public Container OUString m_schemaName; OUString m_tableName; OUString m_indexName; - com::sun::star::uno::Sequence< OUString > m_columns; + css::uno::Sequence< OUString > m_columns; public: // instances IndexColumns 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, const OUString &indexName, - const com::sun::star::uno::Sequence< OUString > &columns ); + const css::uno::Sequence< OUString > &columns ); protected: IndexColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, const OUString &indexName, - const com::sun::star::uno::Sequence< OUString > &columns ); + const css::uno::Sequence< OUString > &columns ); virtual ~IndexColumns(); public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; @@ -101,20 +101,20 @@ class IndexColumnDescriptors : public Container { public: // instances IndexColumns 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); protected: IndexColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx index 7b415fe2e5c7..53766136a3ce 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx @@ -76,7 +76,7 @@ namespace pq_sdbc_driver Indexes::Indexes( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName) @@ -90,7 +90,7 @@ Indexes::~Indexes() {} void Indexes::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -151,7 +151,7 @@ void Indexes::refresh() bool isUnique = row->getBoolean( C_IS_UNIQUE ); bool isPrimary = row->getBoolean( C_IS_PRIMARY ); bool isClusterd = row->getBoolean( C_IS_CLUSTERED ); - Reference< com::sun::star::beans::XPropertySet > prop = pIndex; + Reference< css::beans::XPropertySet > prop = pIndex; pIndex->setPropertyValue_NoBroadcast_public( st.IS_UNIQUE, Any( isUnique ) ); pIndex->setPropertyValue_NoBroadcast_public( @@ -179,7 +179,7 @@ void Indexes::refresh() } m_name2index.swap( map ); } - catch ( com::sun::star::sdbc::SQLException & e ) + catch ( css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -189,10 +189,10 @@ void Indexes::refresh() 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { Statics & st = getStatics(); OUString name = extractStringProperty( descriptor, st.NAME ); @@ -241,9 +241,9 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { @@ -256,7 +256,7 @@ void Indexes::dropByIndex( sal_Int32 index ) buf.append( ", got " ); buf.append( index ); buf.append( ")" ); - throw com::sun::star::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); } @@ -273,21 +273,21 @@ void Indexes::dropByIndex( sal_Int32 index ) } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Indexes::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > Indexes::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new IndexDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XNameAccess > Indexes::create( +Reference< css::container::XNameAccess > Indexes::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString & schemaName, const OUString & tableName) { Indexes *pIndexes = new Indexes( refMutex, origin, pSettings, schemaName, tableName ); - Reference< com::sun::star::container::XNameAccess > ret = pIndexes; + Reference< css::container::XNameAccess > ret = pIndexes; pIndexes->refresh(); return ret; } @@ -295,21 +295,21 @@ Reference< com::sun::star::container::XNameAccess > Indexes::create( IndexDescriptors::IndexDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings) : Container( refMutex, origin, pSettings, getStatics().INDEX ) {} -Reference< com::sun::star::container::XNameAccess > IndexDescriptors::create( +Reference< css::container::XNameAccess > IndexDescriptors::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings) { return new IndexDescriptors( refMutex, origin, pSettings ); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > IndexDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > IndexDescriptors::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new IndexDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.hxx b/connectivity/source/drivers/postgresql/pq_xindexes.hxx index cb1a601483d0..2b49bca04231 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexes.hxx +++ b/connectivity/source/drivers/postgresql/pq_xindexes.hxx @@ -47,9 +47,9 @@ class Indexes : public Container OUString m_tableName; public: // instances Columns 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName); @@ -57,7 +57,7 @@ public: // instances Columns 'exception safe' protected: Indexes( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName); @@ -66,43 +66,43 @@ protected: public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; class IndexDescriptors : public Container { public: // instances IndexDescriptors 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); protected: IndexDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx index 3e7357fb3fc8..ac15478a9282 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx @@ -63,7 +63,7 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings, const OUString & schemaName, const OUString & tableName ) @@ -87,7 +87,7 @@ Reference< XPropertySet > Key::createDataDescriptor( ) throw (RuntimeException, return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > Key::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > Key::getColumns( ) throw (css::uno::RuntimeException, std::exception) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -112,7 +112,7 @@ Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception ) if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(), + cppu::UnoType<css::sdbcx::XColumnsSupplier>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -133,13 +133,13 @@ Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::ex if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XColumnsSupplier * > ( this ) ); + static_cast< css::sdbcx::XColumnsSupplier * > ( this ) ); return ret; } KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) : ReflectionBase( getStatics().refl.keyDescriptor.implName, @@ -160,7 +160,7 @@ Reference< XPropertySet > KeyDescriptor::createDataDescriptor( ) throw (Runtime return Reference< XPropertySet > ( pKeyDescriptor ); } -Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > KeyDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) { // TODO: cash columns object ! if( !m_keyColumns.is() ) @@ -179,7 +179,7 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exceptio if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(), + cppu::UnoType<css::sdbcx::XColumnsSupplier>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -200,7 +200,7 @@ Any KeyDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExceptio if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XColumnsSupplier * > ( this ) ); + static_cast< css::sdbcx::XColumnsSupplier * > ( this ) ); return ret; } diff --git a/connectivity/source/drivers/postgresql/pq_xkey.hxx b/connectivity/source/drivers/postgresql/pq_xkey.hxx index 76fda2a68f16..c416a9438b60 100644 --- a/connectivity/source/drivers/postgresql/pq_xkey.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkey.hxx @@ -51,16 +51,16 @@ namespace pq_sdbc_driver { class Key : public ReflectionBase, - public com::sun::star::sdbcx::XColumnsSupplier + public css::sdbcx::XColumnsSupplier { - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_keyColumns; + css::uno::Reference< css::container::XNameAccess > m_keyColumns; OUString m_schemaName; OUString m_tableName; public: Key( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName); @@ -68,56 +68,56 @@ public: public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getColumns( ) throw (css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; -class KeyDescriptor : public ReflectionBase, public com::sun::star::sdbcx::XColumnsSupplier +class KeyDescriptor : public ReflectionBase, public css::sdbcx::XColumnsSupplier { - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_keyColumns; + css::uno::Reference< css::container::XNameAccess > m_keyColumns; public: KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ); public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; public: // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getColumns( ) throw (css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx index d50d9d9e92ab..4493bd8a91ae 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx @@ -46,7 +46,7 @@ using com::sun::star::beans::XPropertySet; namespace pq_sdbc_driver { KeyColumn::KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.keycolumn.implName, @@ -68,7 +68,7 @@ Reference< XPropertySet > KeyColumn::createDataDescriptor( ) throw (RuntimeExce KeyColumnDescriptor::KeyColumnDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.keycolumnDescriptor.implName, diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx index 5ca4aa003bf5..2c7ff37235a5 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx @@ -53,12 +53,12 @@ class KeyColumn : public ReflectionBase { public: KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -67,12 +67,12 @@ class KeyColumnDescriptor : public ReflectionBase public: KeyColumnDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx index e001f615998d..4812758d3e08 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx @@ -69,7 +69,7 @@ namespace pq_sdbc_driver KeyColumns::KeyColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, @@ -87,7 +87,7 @@ KeyColumns::~KeyColumns() void KeyColumns::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -131,7 +131,7 @@ void KeyColumns::refresh() KeyColumn * pKeyColumn = new KeyColumn( m_refMutex, m_origin, m_pSettings ); - Reference< com::sun::star::beans::XPropertySet > prop = pKeyColumn; + Reference< css::beans::XPropertySet > prop = pKeyColumn; OUString name = columnMetaData2SDBCX( pKeyColumn, xRow ); if( keyindex < m_foreignColumnNames.getLength() ) @@ -148,7 +148,7 @@ void KeyColumns::refresh() } m_name2index.swap( map ); } - catch ( com::sun::star::sdbc::SQLException & e ) + catch ( css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -158,20 +158,20 @@ void KeyColumns::refresh() 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& future ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { (void) future; - throw com::sun::star::sdbc::SQLException( + throw css::sdbc::SQLException( "KeyColumns::appendByDescriptor not implemented yet", *this, OUString(), 1, Any() ); // osl::MutexGuard guard( m_refMutex->mutex ); // Statics & st = getStatics(); // Reference< XPropertySet > past = createDataDescriptor(); -// past->setPropertyValue( st.IS_NULLABLE, makeAny( com::sun::star::sdbc::ColumnValue::NULLABLE ) ); +// past->setPropertyValue( st.IS_NULLABLE, makeAny( css::sdbc::ColumnValue::NULLABLE ) ); // alterColumnByDescriptor( // m_schemaName, m_tableName, m_pSettings->encoding, m_origin->createStatement() , past, future ); @@ -179,12 +179,12 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { (void) index; - throw com::sun::star::sdbc::SQLException( + throw css::sdbc::SQLException( "KeyColumns::dropByIndex not implemented yet", *this, OUString(), 1, Any() ); // osl::MutexGuard guard( m_refMutex->mutex ); @@ -196,7 +196,7 @@ void KeyColumns::dropByIndex( sal_Int32 index ) // buf.appendAscii( ", got " ); // buf.append( index ); // buf.appendAscii( ")" ); -// throw com::sun::star::lang::IndexOutOfBoundsException( +// throw css::lang::IndexOutOfBoundsException( // buf.makeStringAndClear(), *this ); // } @@ -218,15 +218,15 @@ void KeyColumns::dropByIndex( sal_Int32 index ) } -Reference< ::com::sun::star::beans::XPropertySet > KeyColumns::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< css::beans::XPropertySet > KeyColumns::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XNameAccess > KeyColumns::create( +Reference< css::container::XNameAccess > KeyColumns::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, @@ -235,7 +235,7 @@ Reference< com::sun::star::container::XNameAccess > KeyColumns::create( { KeyColumns *pKeyColumns = new KeyColumns( refMutex, origin, pSettings, schemaName, tableName, columnNames, foreignColumnNames ); - Reference< com::sun::star::container::XNameAccess > ret = pKeyColumns; + Reference< css::container::XNameAccess > ret = pKeyColumns; pKeyColumns->refresh(); return ret; @@ -244,13 +244,13 @@ Reference< com::sun::star::container::XNameAccess > KeyColumns::create( KeyColumnDescriptors::KeyColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ) : Container( refMutex, origin, pSettings, "KEY_COLUMN" ) {} -Reference< ::com::sun::star::beans::XPropertySet > KeyColumnDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< css::beans::XPropertySet > KeyColumnDescriptors::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new KeyColumnDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx index 2b85e9808f67..dbdfa600e24d 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx @@ -46,50 +46,50 @@ class KeyColumns : public Container { OUString m_schemaName; OUString m_tableName; - com::sun::star::uno::Sequence< OUString > m_columnNames; - com::sun::star::uno::Sequence< OUString > m_foreignColumnNames; + css::uno::Sequence< OUString > m_columnNames; + css::uno::Sequence< OUString > m_foreignColumnNames; public: // instances KeyColumns 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, - const com::sun::star::uno::Sequence< OUString > &keyColumns, - const com::sun::star::uno::Sequence< OUString > &foreignColumnNames ); + const css::uno::Sequence< OUString > &keyColumns, + const css::uno::Sequence< OUString > &foreignColumnNames ); protected: KeyColumns( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName, - const com::sun::star::uno::Sequence< OUString > &keyColumns, - const com::sun::star::uno::Sequence< OUString > &foreignColumnNames); + const css::uno::Sequence< OUString > &keyColumns, + const css::uno::Sequence< OUString > &foreignColumnNames); virtual ~KeyColumns(); public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; @@ -98,12 +98,12 @@ class KeyColumnDescriptors : public Container public: KeyColumnDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; } #endif diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx index 7929accb60ae..7d5979eb75a7 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx @@ -50,7 +50,7 @@ using osl::MutexGuard; -using com::sun::star::beans::XPropertySet; +using css::beans::XPropertySet; using com::sun::star::uno::makeAny; using com::sun::star::uno::UNO_QUERY; @@ -69,7 +69,7 @@ namespace pq_sdbc_driver Keys::Keys( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName) @@ -83,30 +83,30 @@ Keys::~Keys() static sal_Int32 string2keytype( const OUString &type ) { - sal_Int32 ret = com::sun::star::sdbcx::KeyType::UNIQUE; + sal_Int32 ret = css::sdbcx::KeyType::UNIQUE; if ( type == "p" ) - ret = com::sun::star::sdbcx::KeyType::PRIMARY; + ret = css::sdbcx::KeyType::PRIMARY; else if ( type == "f" ) - ret = com::sun::star::sdbcx::KeyType::FOREIGN; + ret = css::sdbcx::KeyType::FOREIGN; return ret; } static sal_Int32 string2keyrule( const OUString & rule ) { - sal_Int32 ret = com::sun::star::sdbc::KeyRule::NO_ACTION; + sal_Int32 ret = css::sdbc::KeyRule::NO_ACTION; if( rule == "r" ) - ret = com::sun::star::sdbc::KeyRule::RESTRICT; + ret = css::sdbc::KeyRule::RESTRICT; else if( rule == "c" ) - ret = com::sun::star::sdbc::KeyRule::CASCADE; + ret = css::sdbc::KeyRule::CASCADE; else if( rule == "n" ) - ret = com::sun::star::sdbc::KeyRule::SET_NULL; + ret = css::sdbc::KeyRule::SET_NULL; else if( rule == "d" ) - ret = com::sun::star::sdbc::KeyRule::SET_DEFAULT; + ret = css::sdbc::KeyRule::SET_DEFAULT; return ret; } void Keys::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -153,7 +153,7 @@ void Keys::refresh() { Key * pKey = new Key( m_refMutex, m_origin, m_pSettings , m_schemaName, m_tableName ); - Reference< com::sun::star::beans::XPropertySet > prop = pKey; + Reference< css::beans::XPropertySet > prop = pKey; pKey->setPropertyValue_NoBroadcast_public( st.NAME, makeAny( xRow->getString( 1 ) ) ); @@ -170,7 +170,7 @@ void Keys::refresh() mainMap, string2intarray( xRow->getString( 7 ) ) ) ) ); - if( com::sun::star::sdbcx::KeyType::FOREIGN == keyType ) + if( css::sdbcx::KeyType::FOREIGN == keyType ) { OUStringBuffer buf( 128 ); buf.append( xRow->getString( 6 ) + "." + xRow->getString( 5 ) ); @@ -196,7 +196,7 @@ void Keys::refresh() } m_name2index.swap( map ); } - catch ( com::sun::star::sdbc::SQLException & e ) + catch ( css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -206,10 +206,10 @@ void Keys::refresh() 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -226,9 +226,9 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -236,7 +236,7 @@ void Keys::dropByIndex( sal_Int32 index ) OUStringBuffer buf( 128 ); buf.append( "TABLES: Index out of range (allowed 0 to " + OUString::number(m_values.size() -1) + ", got " + OUString::number( index ) + ")" ); - throw com::sun::star::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); } @@ -256,21 +256,21 @@ void Keys::dropByIndex( sal_Int32 index ) } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Keys::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > Keys::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new KeyDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XIndexAccess > Keys::create( +Reference< css::container::XIndexAccess > Keys::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString & schemaName, const OUString & tableName) { Keys *pKeys = new Keys( refMutex, origin, pSettings, schemaName, tableName ); - Reference< com::sun::star::container::XIndexAccess > ret = pKeys; + Reference< css::container::XIndexAccess > ret = pKeys; pKeys->refresh(); return ret; @@ -278,21 +278,21 @@ Reference< com::sun::star::container::XIndexAccess > Keys::create( KeyDescriptors::KeyDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings) : Container( refMutex, origin, pSettings, getStatics().KEY ) {} -Reference< com::sun::star::container::XIndexAccess > KeyDescriptors::create( +Reference< css::container::XIndexAccess > KeyDescriptors::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings) { return new KeyDescriptors( refMutex, origin, pSettings ); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > KeyDescriptors::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > KeyDescriptors::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new KeyDescriptor( m_refMutex, m_origin, m_pSettings ); } diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.hxx b/connectivity/source/drivers/postgresql/pq_xkeys.hxx index bb52315665ab..d13c9e448d87 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.hxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.hxx @@ -47,9 +47,9 @@ class Keys : public Container OUString m_tableName; public: // instances Columns 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > create( + static css::uno::Reference< css::container::XIndexAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName); @@ -57,7 +57,7 @@ public: // instances Columns 'exception safe' protected: Keys( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, const OUString &schemaName, const OUString &tableName); @@ -66,43 +66,43 @@ protected: public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; class KeyDescriptors : public Container { public: // instances Columns 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > create( + static css::uno::Reference< css::container::XIndexAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); protected: KeyDescriptors( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index 7a14cbfc497f..4b8d4518c1f4 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -76,7 +76,7 @@ using com::sun::star::sdbc::SQLException; namespace pq_sdbc_driver { Table::Table( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.table.implName, @@ -97,7 +97,7 @@ Reference< XPropertySet > Table::createDataDescriptor( ) throw (RuntimeExceptio return Reference< XPropertySet > ( pTable ); } -Reference< XNameAccess > Table::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > Table::getColumns( ) throw (css::uno::RuntimeException, std::exception) { if( ! m_columns.is() ) { @@ -112,7 +112,7 @@ Reference< XNameAccess > Table::getColumns( ) throw (::com::sun::star::uno::Run return m_columns; } -Reference< XNameAccess > Table::getIndexes() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > Table::getIndexes() throw (css::uno::RuntimeException, std::exception) { if( ! m_indexes.is() ) { @@ -126,7 +126,7 @@ Reference< XNameAccess > Table::getIndexes() throw (::com::sun::star::uno::Runti return m_indexes; } -Reference< XIndexAccess > Table::getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XIndexAccess > Table::getKeys( ) throw (css::uno::RuntimeException, std::exception) { if( ! m_keys.is() ) { @@ -141,9 +141,9 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); Statics & st = getStatics(); @@ -172,7 +172,7 @@ void Table::rename( const OUString& newName ) { // maintain view list (really strange API !) Any a = m_pSettings->pViewsImpl->getByName( fullOldName ); - Reference< com::sun::star::sdbcx::XRename > Xrename; + Reference< css::sdbcx::XRename > Xrename; a >>= Xrename; if( Xrename.is() ) { @@ -198,7 +198,7 @@ void Table::rename( const OUString& newName ) disposeNoThrow( statement ); schema = newSchemaName; } - catch( com::sun::star::sdbc::SQLException &e ) + catch( css::sdbc::SQLException &e ) { OUString buf( e.Message + "(NOTE: Only postgresql server >= V8.1 support changing a table's schema)" ); e.Message = buf; @@ -231,8 +231,8 @@ void Table::alterColumnByName( const Reference< XPropertySet >& descriptor ) throw (SQLException,NoSuchElementException,RuntimeException, std::exception) { - Reference< com::sun::star::container::XNameAccess > columns = - Reference< com::sun::star::container::XNameAccess > ( getColumns(), UNO_QUERY ); + Reference< css::container::XNameAccess > columns = + Reference< css::container::XNameAccess > ( getColumns(), UNO_QUERY ); OUString newName = extractStringProperty(descriptor, getStatics().NAME ); ::pq_sdbc_driver::alterColumnByDescriptor( @@ -240,7 +240,7 @@ void Table::alterColumnByName( extractStringProperty( this, getStatics().NAME ), m_pSettings, m_conn->createStatement(), - Reference< com::sun::star::beans::XPropertySet>( columns->getByName( colName ), UNO_QUERY) , + Reference< css::beans::XPropertySet>( columns->getByName( colName ), UNO_QUERY) , descriptor ); if( colName != newName ) @@ -252,12 +252,12 @@ void Table::alterColumnByName( void Table::alterColumnByIndex( sal_Int32 index, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw (SQLException,IndexOutOfBoundsException,RuntimeException, std::exception) { - Reference< com::sun::star::container::XIndexAccess > columns = - Reference< com::sun::star::container::XIndexAccess>( getColumns(), UNO_QUERY ); - Reference< com::sun::star::beans::XPropertySet> column(columns->getByIndex( index ), UNO_QUERY ); + Reference< css::container::XIndexAccess > columns = + Reference< css::container::XIndexAccess>( getColumns(), UNO_QUERY ); + Reference< css::beans::XPropertySet> column(columns->getByIndex( index ), UNO_QUERY ); ::pq_sdbc_driver::alterColumnByDescriptor( extractStringProperty( this, getStatics().SCHEMA_NAME ), extractStringProperty( this, getStatics().NAME ), @@ -277,11 +277,11 @@ Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception ) if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XIndexesSupplier>::get(), - cppu::UnoType<com::sun::star::sdbcx::XKeysSupplier>::get(), - cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(), - cppu::UnoType<com::sun::star::sdbcx::XRename>::get(), - cppu::UnoType<com::sun::star::sdbcx::XAlterTable>::get(), + cppu::UnoType<css::sdbcx::XIndexesSupplier>::get(), + cppu::UnoType<css::sdbcx::XKeysSupplier>::get(), + cppu::UnoType<css::sdbcx::XColumnsSupplier>::get(), + cppu::UnoType<css::sdbcx::XRename>::get(), + cppu::UnoType<css::sdbcx::XAlterTable>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -302,23 +302,23 @@ Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std:: if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XIndexesSupplier * > ( this ), - static_cast< com::sun::star::sdbcx::XKeysSupplier * > ( this ), - static_cast< com::sun::star::sdbcx::XColumnsSupplier * > ( this ), - static_cast< com::sun::star::sdbcx::XRename * > ( this ), - static_cast< com::sun::star::sdbcx::XAlterTable * > ( this ) + static_cast< css::sdbcx::XIndexesSupplier * > ( this ), + static_cast< css::sdbcx::XKeysSupplier * > ( this ), + static_cast< css::sdbcx::XColumnsSupplier * > ( this ), + static_cast< css::sdbcx::XRename * > ( this ), + static_cast< css::sdbcx::XAlterTable * > ( this ) ); return ret; } -::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, std::exception) +css::uno::Any Table::getPropertyValue(const OUString& aPropertyName) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { return ReflectionBase::getPropertyValue( aPropertyName ); } -OUString Table::getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString Table::getName( ) throw (css::uno::RuntimeException, std::exception) { Statics & st = getStatics(); return concatQualified( @@ -326,7 +326,7 @@ OUString Table::getName( ) throw (::com::sun::star::uno::RuntimeException, std: extractStringProperty( this, st.NAME ) ); } -void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void Table::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) { rename( aName ); } @@ -334,7 +334,7 @@ void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::Runti TableDescriptor::TableDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.tableDescriptor.implName, @@ -346,7 +346,7 @@ TableDescriptor::TableDescriptor( { } -Reference< XNameAccess > TableDescriptor::getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > TableDescriptor::getColumns( ) throw (css::uno::RuntimeException, std::exception) { if( ! m_columns.is() ) { @@ -355,7 +355,7 @@ Reference< XNameAccess > TableDescriptor::getColumns( ) throw (::com::sun::star return m_columns; } -Reference< XNameAccess > TableDescriptor::getIndexes() throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XNameAccess > TableDescriptor::getIndexes() throw (css::uno::RuntimeException, std::exception) { if( ! m_indexes.is() ) { @@ -367,7 +367,7 @@ Reference< XNameAccess > TableDescriptor::getIndexes() throw (::com::sun::star:: return m_indexes; } -Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +Reference< XIndexAccess > TableDescriptor::getKeys( ) throw (css::uno::RuntimeException, std::exception) { if( ! m_keys.is() ) { @@ -389,9 +389,9 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::except if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XIndexesSupplier>::get(), - cppu::UnoType<com::sun::star::sdbcx::XKeysSupplier>::get(), - cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(), + cppu::UnoType<css::sdbcx::XIndexesSupplier>::get(), + cppu::UnoType<css::sdbcx::XKeysSupplier>::get(), + cppu::UnoType<css::sdbcx::XColumnsSupplier>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -412,9 +412,9 @@ Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeExcept if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XIndexesSupplier * > ( this ), - static_cast< com::sun::star::sdbcx::XKeysSupplier * > ( this ), - static_cast< com::sun::star::sdbcx::XColumnsSupplier * > ( this )); + static_cast< css::sdbcx::XIndexesSupplier * > ( this ), + static_cast< css::sdbcx::XKeysSupplier * > ( this ), + static_cast< css::sdbcx::XColumnsSupplier * > ( this )); return ret; } diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index 2d6f38f04a9c..3ff598c0ed3e 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -57,126 +57,126 @@ namespace pq_sdbc_driver class Columns; class Table : public ReflectionBase, - public com::sun::star::sdbcx::XColumnsSupplier, - public com::sun::star::sdbcx::XIndexesSupplier, - public com::sun::star::sdbcx::XKeysSupplier, - public com::sun::star::sdbcx::XRename, - public com::sun::star::sdbcx::XAlterTable + public css::sdbcx::XColumnsSupplier, + public css::sdbcx::XIndexesSupplier, + public css::sdbcx::XKeysSupplier, + public css::sdbcx::XRename, + public css::sdbcx::XAlterTable { - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_columns; - ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_keys; - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexes; + css::uno::Reference< css::container::XNameAccess > m_columns; + css::uno::Reference< css::container::XIndexAccess > m_keys; + css::uno::Reference< css::container::XNameAccess > m_indexes; Columns *m_pColumns; public: Table( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; // 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getColumns( ) throw (css::uno::RuntimeException, std::exception) override; // XIndexesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getIndexes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getIndexes( ) throw (css::uno::RuntimeException, std::exception) override; // XKeysSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getKeys( ) throw (css::uno::RuntimeException, std::exception) override; // 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, std::exception) override; + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; // XAlterTable virtual void SAL_CALL alterColumnByName( const OUString& colName, - 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; // 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, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& aPropertyName) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; }; class TableDescriptor : public ReflectionBase, - public com::sun::star::sdbcx::XColumnsSupplier, - public com::sun::star::sdbcx::XIndexesSupplier, - public com::sun::star::sdbcx::XKeysSupplier + public css::sdbcx::XColumnsSupplier, + public css::sdbcx::XIndexesSupplier, + public css::sdbcx::XKeysSupplier { - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_columns; - ::com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > m_keys; - ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_indexes; + css::uno::Reference< css::container::XNameAccess > m_columns; + css::uno::Reference< css::container::XIndexAccess > m_keys; + css::uno::Reference< css::container::XNameAccess > m_indexes; public: TableDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; public: // XColumnsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getColumns( ) throw (css::uno::RuntimeException, std::exception) override; public: // XIndexesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL - getIndexes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL + getIndexes( ) throw (css::uno::RuntimeException, std::exception) override; public: // XKeysSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL - getKeys( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL + getKeys( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx index b824dddb25e8..97a9b7f2b4a6 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx @@ -73,7 +73,7 @@ namespace pq_sdbc_driver { Tables::Tables( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ) : Container( refMutex, origin, pSettings, getStatics().TABLE ) {} @@ -82,7 +82,7 @@ Tables::~Tables() {} void Tables::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -106,7 +106,7 @@ void Tables::refresh() // instead offer a factory interface Table * pTable = new Table( m_refMutex, m_origin, m_pSettings ); - Reference< com::sun::star::beans::XPropertySet > prop = pTable; + Reference< css::beans::XPropertySet > prop = pTable; OUString name = xRow->getString( TABLE_INDEX_NAME+1); OUString schema = xRow->getString( TABLE_INDEX_SCHEMA+1); @@ -121,15 +121,15 @@ void Tables::refresh() pTable->setPropertyValue_NoBroadcast_public( st.PRIVILEGES , makeAny( (sal_Int32) - ( com::sun::star::sdbcx::Privilege::SELECT | - com::sun::star::sdbcx::Privilege::INSERT | - com::sun::star::sdbcx::Privilege::UPDATE | - com::sun::star::sdbcx::Privilege::DELETE | - com::sun::star::sdbcx::Privilege::READ | - com::sun::star::sdbcx::Privilege::CREATE | - com::sun::star::sdbcx::Privilege::ALTER | - com::sun::star::sdbcx::Privilege::REFERENCE | - com::sun::star::sdbcx::Privilege::DROP ) ) ); + ( css::sdbcx::Privilege::SELECT | + css::sdbcx::Privilege::INSERT | + css::sdbcx::Privilege::UPDATE | + css::sdbcx::Privilege::DELETE | + css::sdbcx::Privilege::READ | + css::sdbcx::Privilege::CREATE | + css::sdbcx::Privilege::ALTER | + css::sdbcx::Privilege::REFERENCE | + css::sdbcx::Privilege::DROP ) ) ); { m_values.push_back( makeAny( prop ) ); @@ -141,7 +141,7 @@ void Tables::refresh() } m_name2index.swap( map ); } - catch ( const com::sun::star::sdbc::SQLException & e ) + catch ( const css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -185,12 +185,12 @@ static void appendColumnList( { sal_Int32 dataType = 0; column->getPropertyValue( st.TYPE ) >>= dataType; - if( com::sun::star::sdbc::DataType::INTEGER == dataType ) + if( css::sdbc::DataType::INTEGER == dataType ) { buf.append( " serial "); isNullable = false; } - else if( com::sun::star::sdbc::DataType::BIGINT == dataType ) + else if( css::sdbc::DataType::BIGINT == dataType ) { buf.append( " serial8 " ); isNullable = false; @@ -235,10 +235,10 @@ static void appendKeyList( } 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); Reference< XStatement > stmt = @@ -313,9 +313,9 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -323,7 +323,7 @@ void Tables::dropByIndex( sal_Int32 index ) OUStringBuffer buf( 128 ); buf.append( "TABLES: Index out of range (allowed 0 to " + OUString::number(m_values.size() -1) + ", got " + OUString::number( index ) + ")" ); - throw com::sun::star::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); + throw css::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); } Reference< XPropertySet > set; @@ -354,20 +354,20 @@ void Tables::dropByIndex( sal_Int32 index ) } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Tables::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > Tables::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new TableDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XNameAccess > Tables::create( +Reference< css::container::XNameAccess > Tables::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, Tables **ppTables) { *ppTables = new Tables( refMutex, origin, pSettings ); - Reference< com::sun::star::container::XNameAccess > ret = *ppTables; + Reference< css::container::XNameAccess > ret = *ppTables; (*ppTables)->refresh(); return ret; diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx index e7ca0e8b9718..d46ec043dea2 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx @@ -46,43 +46,43 @@ class Tables : public Container { public: // instances Tables 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, Tables ** ppTables); protected: Tables( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); virtual ~Tables(); public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; 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); +// throw (css::sdbc::SQLException, +// css::container::NoSuchElementException, +// css::uno::RuntimeException); virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; protected: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx index 7b91d43217c3..ca0b7433b17f 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.cxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx @@ -63,7 +63,7 @@ namespace pq_sdbc_driver { User::User( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) : ReflectionBase( getStatics().refl.user.implName, @@ -92,7 +92,7 @@ Sequence<Type > User::getTypes() throw( RuntimeException, std::exception ) if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XUser>::get(), + cppu::UnoType<css::sdbcx::XUser>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -113,14 +113,14 @@ Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::e if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XUser * > ( this ) ); + static_cast< css::sdbcx::XUser * > ( this ) ); return ret; } void User::changePassword( const OUString& oldPassword, const OUString& newPassword ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) oldPassword; OUStringBuffer buf(128); @@ -134,7 +134,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, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { sal_Int32 ret = 0xffffffff; if( isLog( m_pSettings, LogLevel::INFO ) ) @@ -152,7 +152,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, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; // all privileges @@ -160,25 +160,25 @@ 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, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; - throw com::sun::star::sdbc::SQLException("pq_driver: privilege change not implemented yet", + throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", *this, OUString(), 1, Any() ); } void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) - throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { (void) objName; (void) objType; (void) objPrivileges; - throw com::sun::star::sdbc::SQLException("pq_driver: privilege change not implemented yet", + throw css::sdbc::SQLException("pq_driver: privilege change not implemented yet", *this, OUString(), 1, Any() ); } UserDescriptor::UserDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings ) : ReflectionBase( getStatics().refl.userDescriptor.implName, diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx index c7ed640181d1..68ee639201b2 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.hxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx @@ -50,37 +50,37 @@ namespace pq_sdbc_driver { class User : public ReflectionBase, - public com::sun::star::sdbcx::XUser + public css::sdbcx::XUser { public: User( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; // 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; // XUser : XAuthorizable - 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) override; - 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) override; - 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) override; - 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) override; - virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changePassword( const OUString& oldPassword, const OUString& newPassword ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; class UserDescriptor : public ReflectionBase @@ -88,12 +88,12 @@ class UserDescriptor : public ReflectionBase public: UserDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xusers.cxx b/connectivity/source/drivers/postgresql/pq_xusers.cxx index b91ec7f7ac89..e92158e823d4 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.cxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.cxx @@ -63,7 +63,7 @@ namespace pq_sdbc_driver { Users::Users( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ) : Container( refMutex, origin, pSettings, getStatics().USER ) {} @@ -72,7 +72,7 @@ Users::~Users() {} void Users::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -93,7 +93,7 @@ void Users::refresh() { User * pUser = new User( m_refMutex, m_origin, m_pSettings ); - Reference< com::sun::star::beans::XPropertySet > prop = pUser; + Reference< css::beans::XPropertySet > prop = pUser; OUString name = xRow->getString( 1); pUser->setPropertyValue_NoBroadcast_public( @@ -107,7 +107,7 @@ void Users::refresh() } m_name2index.swap( map ); } - catch ( com::sun::star::sdbc::SQLException & e ) + catch ( css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -117,10 +117,10 @@ void Users::refresh() 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -136,9 +136,9 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) @@ -147,16 +147,16 @@ void Users::dropByName( const OUString& elementName ) buf.append( "User " ); buf.append( elementName ); buf.append( " is unknown, so it can't be dropped" ); - throw com::sun::star::container::NoSuchElementException( + throw css::container::NoSuchElementException( buf.makeStringAndClear(), *this ); } dropByIndex( ii->second ); } void Users::dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -168,7 +168,7 @@ void Users::dropByIndex( sal_Int32 index ) buf.append( ", got " ); buf.append( index ); buf.append( ")" ); - throw com::sun::star::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); } @@ -187,19 +187,19 @@ void Users::dropByIndex( sal_Int32 index ) } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Users::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > Users::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new UserDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XNameAccess > Users::create( +Reference< css::container::XNameAccess > Users::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ) { Users *pUsers = new Users( refMutex, origin, pSettings ); - Reference< com::sun::star::container::XNameAccess > ret = pUsers; + Reference< css::container::XNameAccess > ret = pUsers; pUsers->refresh(); return ret; diff --git a/connectivity/source/drivers/postgresql/pq_xusers.hxx b/connectivity/source/drivers/postgresql/pq_xusers.hxx index 28c47f26c95f..0ab9ef83ed17 100644 --- a/connectivity/source/drivers/postgresql/pq_xusers.hxx +++ b/connectivity/source/drivers/postgresql/pq_xusers.hxx @@ -46,42 +46,42 @@ class Users : public Container { public: // instances Tables 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); protected: Users( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ); virtual ~Users(); public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; protected: virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index a2c6d163b53c..c42f533a410f 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -67,7 +67,7 @@ namespace pq_sdbc_driver { View::View( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.view.implName, @@ -88,9 +88,9 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { MutexGuard guard( m_refMutex->mutex ); @@ -131,7 +131,7 @@ void View::rename( const OUString& newName ) disposeNoThrow( statement ); schema = newSchemaName; } - catch( com::sun::star::sdbc::SQLException &e ) + catch( css::sdbc::SQLException &e ) { OUString buf( e.Message + "(NOTE: Only postgresql server >= V8.1 support changing a table's schema)" ); e.Message = buf; @@ -167,7 +167,7 @@ Sequence<Type > View::getTypes() throw( RuntimeException, std::exception ) if( !pCollection ) { static cppu::OTypeCollection collection( - cppu::UnoType<com::sun::star::sdbcx::XRename>::get(), + cppu::UnoType<css::sdbcx::XRename>::get(), ReflectionBase::getTypes()); pCollection = &collection; } @@ -188,12 +188,12 @@ Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::e if( ! ret.hasValue() ) ret = ::cppu::queryInterface( reqType, - static_cast< com::sun::star::sdbcx::XRename * > ( this ) + static_cast< css::sdbcx::XRename * > ( this ) ); return ret; } -OUString View::getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString View::getName( ) throw (css::uno::RuntimeException, std::exception) { Statics & st = getStatics(); return concatQualified( @@ -201,7 +201,7 @@ OUString View::getName( ) throw (::com::sun::star::uno::RuntimeException, std:: extractStringProperty( this, st.NAME ) ); } -void View::setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void View::setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) { rename( aName ); } @@ -209,7 +209,7 @@ void View::setName( const OUString& aName ) throw (::com::sun::star::uno::Runtim ViewDescriptor::ViewDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const Reference< com::sun::star::sdbc::XConnection > & connection, + const Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings) : ReflectionBase( getStatics().refl.viewDescriptor.implName, diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx index 8fd6fcc99990..7b9270420b2c 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.hxx +++ b/connectivity/source/drivers/postgresql/pq_xview.hxx @@ -50,39 +50,39 @@ namespace pq_sdbc_driver { class View : public ReflectionBase, - public com::sun::star::sdbcx::XRename + public css::sdbcx::XRename { public: View( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); // XInterface virtual void SAL_CALL acquire() throw() override { ReflectionBase::acquire(); } virtual void SAL_CALL release() throw() override { ReflectionBase::release(); } - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const com::sun::star::uno::Type & reqType ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & reqType ) + throw (css::uno::RuntimeException, std::exception) override; // 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, std::exception ) override; - virtual com::sun::star::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() + throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() + throw( css::uno::RuntimeException, std::exception ) override; // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; // 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, std::exception) override; + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -91,12 +91,12 @@ class ViewDescriptor : public ReflectionBase { public: ViewDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & connection, + const css::uno::Reference< css::sdbc::XConnection > & connection, ConnectionSettings *pSettings); // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL + createDataDescriptor( ) throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index 4df8cda7232b..4948907c1311 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -64,7 +64,7 @@ namespace pq_sdbc_driver { Views::Views( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings ) : Container( refMutex, origin, pSettings, getStatics().VIEW ) {} @@ -73,7 +73,7 @@ Views::~Views() {} void Views::refresh() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { try { @@ -106,7 +106,7 @@ void Views::refresh() command = xRow->getString( 3 ); View *pView = new View (m_refMutex, m_origin, m_pSettings ); - Reference< com::sun::star::beans::XPropertySet > prop = pView; + Reference< css::beans::XPropertySet > prop = pView; pView->setPropertyValue_NoBroadcast_public(st.NAME , makeAny(table) ); pView->setPropertyValue_NoBroadcast_public(st.SCHEMA_NAME, makeAny(schema) ); @@ -122,7 +122,7 @@ void Views::refresh() } m_name2index.swap( map ); } - catch ( com::sun::star::sdbc::SQLException & e ) + catch ( css::sdbc::SQLException & e ) { throw RuntimeException( e.Message , e.Context ); } @@ -131,10 +131,10 @@ void Views::refresh() 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, std::exception) + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); @@ -163,25 +163,25 @@ 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, std::exception) + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) { String2IntMap::const_iterator ii = m_name2index.find( elementName ); if( ii == m_name2index.end() ) { OUStringBuffer buf( 128 ); buf.append( "View " + elementName + " is unknown, so it can't be dropped" ); - throw com::sun::star::container::NoSuchElementException( + throw css::container::NoSuchElementException( buf.makeStringAndClear(), *this ); } dropByIndex( ii->second ); } void Views::dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { osl::MutexGuard guard( m_refMutex->mutex ); if( index < 0 || index >= (sal_Int32)m_values.size() ) @@ -189,7 +189,7 @@ void Views::dropByIndex( sal_Int32 index ) OUStringBuffer buf( 128 ); buf.append( "VIEWS: Index out of range (allowed 0 to " + OUString::number(m_values.size() -1) + ", got " + OUString::number( index ) + ")"); - throw com::sun::star::lang::IndexOutOfBoundsException( + throw css::lang::IndexOutOfBoundsException( buf.makeStringAndClear(), *this ); } @@ -209,20 +209,20 @@ void Views::dropByIndex( sal_Int32 index ) } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > Views::createDataDescriptor() - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySet > Views::createDataDescriptor() + throw (css::uno::RuntimeException, std::exception) { return new ViewDescriptor( m_refMutex, m_origin, m_pSettings ); } -Reference< com::sun::star::container::XNameAccess > Views::create( +Reference< css::container::XNameAccess > Views::create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, Views **ppViews) { *ppViews = new Views( refMutex, origin, pSettings ); - Reference< com::sun::star::container::XNameAccess > ret = *ppViews; + Reference< css::container::XNameAccess > ret = *ppViews; (*ppViews)->refresh(); return ret; diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx index 0115d850edbc..751f2018d8f2 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.hxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx @@ -46,43 +46,43 @@ class Views : public Container { public: // instances Views 'exception safe' - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > create( + static css::uno::Reference< css::container::XNameAccess > create( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings, Views **ppViews ); protected: Views( const ::rtl::Reference< RefCountedMutex > & refMutex, - const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > & origin, + const css::uno::Reference< css::sdbc::XConnection > & origin, ConnectionSettings *pSettings); virtual ~Views(); public: // XAppend virtual void SAL_CALL 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, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& descriptor ) + throw (css::sdbc::SQLException, + css::container::ElementExistException, + css::uno::RuntimeException, std::exception) override; 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, std::exception) override; + throw (css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL dropByIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::sdbc::SQLException, + css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) override; public: // XRefreshable - virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh( ) throw (css::uno::RuntimeException, std::exception) override; public: // XDataDescriptorFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) + throw (css::uno::RuntimeException, std::exception) override; protected: virtual void SAL_CALL disposing() override; |