diff options
Diffstat (limited to 'connectivity/source/drivers')
246 files changed, 4580 insertions, 4589 deletions
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index b9c1bd629a60..2a627a017673 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -76,7 +76,7 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde return m_aValue; } -::com::sun::star::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; @@ -110,7 +110,7 @@ sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQ } -Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getObject", *this ); return Any(); @@ -131,14 +131,14 @@ OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(S } - ::com::sun::star::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) + css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } - ::com::sun::star::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) + css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; @@ -169,13 +169,13 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this ); return NULL; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return NULL; diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index c12d63f5ca75..98d865c78547 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -90,7 +90,7 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 5e06ab727924..45a0dfd238d7 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -379,7 +379,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return nRet; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -388,7 +388,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT return NULL; } -void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } @@ -480,8 +480,8 @@ void OConnection::disposing() OConnection_BASE::disposing(); m_bClosed = sal_True; - m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); - m_xCatalog = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier>(); + m_xMetaData = css::uno::WeakReference< css::sdbc::XDatabaseMetaData>(); + m_xCatalog = css::uno::WeakReference< css::sdbcx::XTablesSupplier>(); m_pDriver = NULL; m_pAdoConnection->Close(); @@ -498,7 +498,7 @@ void OConnection::disposing() dispose_ChildImpl(); } -sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index 10349df86d62..7ae2f3f3222e 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) { } -sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); // ADOS::ThrowException(*m_pADOConnection,*this); @@ -59,7 +59,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw } -sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); @@ -68,7 +68,7 @@ sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(: return (!aVar.isNull() && !aVar.isEmpty() ? aVar.getBool() : sal_False); } -OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index cbed47b68d4a..575535cf3a54 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -99,11 +99,11 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(css::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes()); } @@ -137,7 +137,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum } #define BLOCK_SIZE 256 -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -171,7 +171,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResult break; } } - return index ? Reference< ::com::sun::star::io::XInputStream >(new SequenceInputStream(aData)) : Reference< ::com::sun::star::io::XInputStream >(); + return index ? Reference< css::io::XInputStream >(new SequenceInputStream(aData)) : Reference< css::io::XInputStream >(); } // else we ask for a bytesequence aField.get_Value(m_aValue); @@ -180,7 +180,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResult return new SequenceInputStream(m_aValue); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return NULL; @@ -226,7 +226,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co } -::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } @@ -319,7 +319,7 @@ Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*colum } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -368,13 +368,13 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } @@ -650,25 +650,25 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, Run } sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetConcurrency::READ_ONLY; } sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetType::FORWARD_ONLY; } sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; } sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=-1; if(m_pRecordSet) @@ -677,20 +677,20 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const } OUString ODatabaseMetaDataResultSet::getCursorName() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); } void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 /*_par0*/) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this ); } void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { if(m_pRecordSet) m_pRecordSet->put_CacheSize(_par0); @@ -699,18 +699,18 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) ::cppu::IPropertyArrayHelper* ODatabaseMetaDataResultSet::createArrayHelper( ) const { - Sequence< com::sun::star::beans::Property > aProps(5); - com::sun::star::beans::Property* pProperties = aProps.getArray(); + Sequence< css::beans::Property > aProps(5); + css::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -726,14 +726,14 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { switch(nHandle) { case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_FETCHDIRECTION: return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); case PROPERTY_ID_FETCHSIZE: @@ -1193,7 +1193,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() ODatabaseMetaDataResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index c76f64e4bbf3..17b190472106 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 c return 0; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getScale(); diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index a968b28a7d5a..040bf265dd0c 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) +ODriver::ODriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _xORB) : ODriver_BASE(m_aMutex) ,m_xORB(_xORB) { @@ -91,7 +91,7 @@ Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (Runtime return aSNS; } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) { return *(new ODriver(_rxFactory)); } @@ -193,14 +193,14 @@ sal_Int32 SAL_CALL ODriver::getMinorVersion( ) throw(RuntimeException) } // XDataDefinitionSupplier -Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) throw DisposedException(); OConnection* pConnection = NULL; - Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY); + Reference< css::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY); if(xTunnel.is()) { OConnection* pSearchConnection = reinterpret_cast< OConnection* >( xTunnel->getSomething(OConnection::getUnoTunnelImplementationId()) ); @@ -233,7 +233,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co return xTab; } -Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException) { impl_checkURL_throw(url); return getDataDefinitionByConnection(connect(url,info)); diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index a866422472df..a02603a00f38 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -97,7 +97,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { @@ -139,12 +139,12 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } -sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException) { return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType))); } -sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException) { RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType)); if(eNum & adRightWithGrant) @@ -152,12 +152,12 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, s return 0; } -void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges)); } -void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges)); } diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index c81c0c7b2966..9cb1fff2437a 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -87,7 +87,7 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 06b0d3f1b372..6ce330bdc579 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -82,7 +82,7 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 7dbafed79c6e..0e4b78b8b711 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -102,7 +102,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt static_cast< XResultSetMetaDataSupplier*>(this)); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(), cppu::UnoType<XParameters>::get(), @@ -399,12 +399,12 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ setParameter(parameterIndex,adVarBinary,sizeof(sal_Int8)*x.getLength(),x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { if(x.is()) { diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 62a6285e49c9..77849f023272 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -53,20 +53,20 @@ using namespace com::sun::star::sdbc; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw (css::uno::RuntimeException) \ { return OUString("com.sun.star.sdbcx.ado.ResultSet"); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(css::uno::RuntimeException) { - ::com::sun::star::uno::Sequence< OUString > aSupported(2); + css::uno::Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException) { return cppu::supportsService(this, _rServiceName); } @@ -135,11 +135,11 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(css::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } @@ -167,7 +167,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ } #define BLOCK_SIZE 256 -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -207,7 +207,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinarySt return m_aValue.isNull() ? NULL : new ::comphelper::SequenceInputStream(m_aValue); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return NULL; @@ -241,7 +241,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro } -::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } @@ -323,7 +323,7 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { return getValue(columnIndex).makeAny(); } @@ -341,13 +341,13 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept } -::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } @@ -756,25 +756,25 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -784,7 +784,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateBytes(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -968,7 +968,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro } sal_Int32 OResultSet::getResultSetConcurrency() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=ResultSetConcurrency::READ_ONLY; LockTypeEnum eRet; @@ -988,7 +988,7 @@ sal_Int32 OResultSet::getResultSetConcurrency() const } sal_Int32 OResultSet::getResultSetType() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=0; CursorTypeEnum eRet; @@ -1013,13 +1013,13 @@ sal_Int32 OResultSet::getResultSetType() const } sal_Int32 OResultSet::getFetchDirection() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; } sal_Int32 OResultSet::getFetchSize() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=-1; m_pRecordSet->get_CacheSize(&nValue); @@ -1027,43 +1027,43 @@ sal_Int32 OResultSet::getFetchSize() const } OUString OResultSet::getCursorName() const - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); } void OResultSet::setFetchDirection(sal_Int32 /*_par0*/) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this ); } void OResultSet::setFetchSize(sal_Int32 _par0) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { m_pRecordSet->put_CacheSize(_par0); } ::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const { - Sequence< com::sun::star::beans::Property > aProps(5); - com::sun::star::beans::Property* pProperties = aProps.getArray(); + Sequence< css::beans::Property > aProps(5); + css::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); return new ::cppu::OPropertyArrayHelper(aProps); @@ -1079,7 +1079,7 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { switch(nHandle) { @@ -1087,7 +1087,7 @@ sal_Bool OResultSet::convertFastPropertyValue( case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); break; case PROPERTY_ID_FETCHDIRECTION: return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); @@ -1159,7 +1159,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 5d5861de5870..c529e16321d4 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -186,7 +186,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return 0; } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 90b825fe8533..e067254e5b4a 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -119,11 +119,11 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OStatement_Base::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes( ) throw(css::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); } @@ -647,28 +647,28 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R ::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const { - Sequence< com::sun::star::beans::Property > aProps(10); - com::sun::star::beans::Property* pProperties = aProps.getArray(); + Sequence< css::beans::Property > aProps(10); + css::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), PROPERTY_ID_USEBOOKMARKS, cppu::UnoType<bool>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -685,7 +685,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { sal_Bool bModified = sal_False; @@ -828,7 +828,7 @@ void SAL_CALL OStatement::release() throw() OStatement_Base::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(css::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index c3c14a1d05e4..8281fb84d60a 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -139,7 +139,7 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { @@ -186,7 +186,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer refreshColumns(); } -void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) +void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -239,7 +239,7 @@ void SAL_CALL OAdoTable::release() throw() OTable_TYPEDEF::release(); } -OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OAdoTable::getName() throw(css::uno::RuntimeException) { return m_aTable.get_Name(); } diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 98ffd0e73389..725a26f8bb79 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -81,7 +81,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { @@ -141,7 +141,7 @@ void OUserExtend::construct() cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const { - Sequence< com::sun::star::beans::Property > aProps; + Sequence< css::beans::Property > aProps; describeProperties(aProps); return new cppu::OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 7ef8d735eb42..0c72bbd38f7b 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -56,7 +56,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 78f16a6d4371..b351e9edb138 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -129,23 +129,23 @@ OLEVariant::~OLEVariant() OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); } // clears all the memory that was allocated before -OLEVariant::OLEVariant(const ::com::sun::star::util::Date& x ) +OLEVariant::OLEVariant(const css::util::Date& x ) { VariantInit(this); vt = VT_DATE; - dblVal = ::dbtools::DBTypeConversion::toDouble(x,::com::sun::star::util::Date(30,12,1899)); + dblVal = ::dbtools::DBTypeConversion::toDouble(x,css::util::Date(30,12,1899)); } -OLEVariant::OLEVariant(const ::com::sun::star::util::Time& x ) +OLEVariant::OLEVariant(const css::util::Time& x ) { VariantInit(this); vt = VT_DATE; dblVal = ::dbtools::DBTypeConversion::toDouble(x); } -OLEVariant::OLEVariant(const ::com::sun::star::util::DateTime& x ) +OLEVariant::OLEVariant(const css::util::DateTime& x ) { VariantInit(this); vt = VT_DATE; - dblVal = ::dbtools::DBTypeConversion::toDouble(x,::com::sun::star::util::Date(30,12,1899)); + dblVal = ::dbtools::DBTypeConversion::toDouble(x,css::util::Date(30,12,1899)); } OLEVariant::OLEVariant(const float &x) { @@ -167,7 +167,7 @@ OLEVariant::OLEVariant(IDispatch* pDispInterface) setIDispatch( pDispInterface ); } -OLEVariant::OLEVariant(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) +OLEVariant::OLEVariant(const css::uno::Sequence< sal_Int8 >& x) { VariantInit(this); @@ -333,17 +333,17 @@ sal_Bool OLEVariant::isEmpty() const { return (vt == VT_EMPTY); } VARTYPE OLEVariant::getType() const { return vt; } -OLEVariant::operator ::com::sun::star::util::Date() const +OLEVariant::operator css::util::Date() const { - return isNull() ? ::com::sun::star::util::Date(30,12,1899) : ::dbtools::DBTypeConversion::toDate(getDate(),::com::sun::star::util::Date(30,12,1899)); + return isNull() ? css::util::Date(30,12,1899) : ::dbtools::DBTypeConversion::toDate(getDate(),css::util::Date(30,12,1899)); } -OLEVariant::operator ::com::sun::star::util::Time() const +OLEVariant::operator css::util::Time() const { - return isNull() ? ::com::sun::star::util::Time() : ::dbtools::DBTypeConversion::toTime(getDate()); + return isNull() ? css::util::Time() : ::dbtools::DBTypeConversion::toTime(getDate()); } -OLEVariant::operator ::com::sun::star::util::DateTime()const +OLEVariant::operator css::util::DateTime()const { - return isNull() ? ::com::sun::star::util::DateTime() : ::dbtools::DBTypeConversion::toDateTime(getDate(),::com::sun::star::util::Date(30,12,1899)); + return isNull() ? css::util::DateTime() : ::dbtools::DBTypeConversion::toDateTime(getDate(),css::util::Date(30,12,1899)); } VARIANT_BOOL OLEVariant::VariantBool(sal_Bool bEinBoolean) @@ -409,25 +409,25 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) { ::connectivity::SharedResources aResources; const OUString sError( aResources.getResourceString(STR_TYPE_NOT_CONVERT)); - throw ::com::sun::star::sdbc::SQLException( + throw css::sdbc::SQLException( sError, NULL, OUString( "S1000" ), 1000, - ::com::sun::star::uno::Any() + css::uno::Any() ); } } } -OLEVariant::operator ::com::sun::star::uno::Sequence< sal_Int8 >() const +OLEVariant::operator css::uno::Sequence< sal_Int8 >() const { - ::com::sun::star::uno::Sequence< sal_Int8 > aRet; + css::uno::Sequence< sal_Int8 > aRet; if(V_VT(this) == VT_BSTR) { OLEString sStr(V_BSTR(this)); - aRet = ::com::sun::star::uno::Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>((const wchar_t*)sStr),sizeof(sal_Unicode)*sStr.length()); + aRet = css::uno::Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>((const wchar_t*)sStr),sizeof(sal_Unicode)*sStr.length()); } else if(!isNull()) { @@ -666,9 +666,9 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const return V_ARRAY(&varDest); } -::com::sun::star::uno::Any OLEVariant::makeAny() const +css::uno::Any OLEVariant::makeAny() const { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; switch (V_VT(this)) { case VT_EMPTY: @@ -695,7 +695,7 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const } case VT_DATE: { - aValue <<= (::com::sun::star::util::Date)*this; + aValue <<= (css::util::Date)*this; break; } case VT_BSTR: diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index bde92c9b67f4..9e9fc3b73c25 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.cxx @@ -1619,7 +1619,7 @@ WpBase::operator IDispatch*() return pIUnknown; } -ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) +ADORecordset* WpADOConnection::getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1659,7 +1659,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any return pRecordset; } -ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) +ADORecordset* WpADOConnection::getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1701,7 +1701,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any } -ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) +ADORecordset* WpADOConnection::getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; @@ -1740,7 +1740,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& } ADORecordset* WpADOConnection::getIndexInfo( - const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, + const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool /*unique*/, sal_Bool /*approximate*/ ) { // Create elements used in the array @@ -1782,7 +1782,7 @@ ADORecordset* WpADOConnection::getIndexInfo( return pRecordset; } -ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::Any& catalog, +ADORecordset* WpADOConnection::getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) { @@ -1824,10 +1824,10 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno:: return pRecordset; } -ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, +ADORecordset* WpADOConnection::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) { @@ -1877,7 +1877,7 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A return pRecordset; } -ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& catalog, +ADORecordset* WpADOConnection::getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) { @@ -1916,7 +1916,7 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& return pRecordset; } -ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno::Any& catalog, +ADORecordset* WpADOConnection::getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) @@ -1961,10 +1961,10 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno: return pRecordset; } -ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& catalog, +ADORecordset* WpADOConnection::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 ) { // Create elements used in the array HRESULT hr = S_OK; @@ -2025,7 +2025,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata return pRecordset; } -ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& catalog, +ADORecordset* WpADOConnection::getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) @@ -2069,7 +2069,7 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat return pRecordset; } -ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, +ADORecordset* WpADOConnection::getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 12b1cb966a9b..a36f3260685e 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -268,7 +268,7 @@ sal_Int32 ADOS::mapAdoRights2Sdbc(RightsEnum eRights) if((eRights & adRightInsert) == adRightInsert) nRights |= Privilege::INSERT; if((eRights & adRightDelete) == adRightDelete) - nRights |= ::com::sun::star::sdbcx::Privilege::DELETE; + nRights |= css::sdbcx::Privilege::DELETE; if((eRights & adRightUpdate) == adRightUpdate) nRights |= Privilege::UPDATE; if((eRights & adRightWriteDesign) == adRightWriteDesign) @@ -305,7 +305,7 @@ sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights) return eRights; } -WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException) { if ( !_pRecordSet ) return WpADOField(); diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 0cda5f3e6ec8..f2cfdf2c41f7 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -211,7 +211,7 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S } -::com::sun::star::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog() +css::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XTablesSupplier > xTab = m_xCatalog; diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index f1548ba05d9e..2e207f841089 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -49,9 +49,9 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std // service names from file::OFileDriver -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - connectivity::calc::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL + connectivity::calc::ODriver_CreateInstance(const css::uno::Reference< + css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index 823a99ede40a..dc175865151e 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -166,7 +166,7 @@ void SAL_CALL OCalcResultSet::release() throw() OCalcResultSet_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 71eca9bab2b6..cc3f874b107b 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -362,7 +362,7 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x sal_Int64 nIntTime = static_cast<sal_Int64>(rtl::math::round( fTime * static_cast<double>(::tools::Time::nanoSecPerDay) )); if ( nIntTime == ::tools::Time::nanoSecPerDay) nIntTime = 0; // 23:59:59.9999999995 and above is 00:00:00.00 - ::com::sun::star::util::Time aTime; + css::util::Time aTime; aTime.NanoSeconds = (sal_uInt32)( nIntTime % ::tools::Time::nanoSecPerSec ); nIntTime /= ::tools::Time::nanoSecPerSec; aTime.Seconds = (sal_uInt16)( nIntTime % 60 ); @@ -390,7 +390,7 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x ++nIntDays; // (next day) } - ::com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; aDateTime.NanoSeconds = (sal_uInt16)( nIntTime % ::tools::Time::nanoSecPerSec ); nIntTime /= ::tools::Time::nanoSecPerSec; @@ -599,7 +599,7 @@ void OCalcTable::construct() Reference<XPropertySet> xProp( xDoc, UNO_QUERY ); if (xProp.is()) { - ::com::sun::star::util::Date aDateStruct; + css::util::Date aDateStruct; if ( xProp->getPropertyValue("NullDate") >>= aDateStruct ) m_aNullDate = ::Date( aDateStruct.Day, aDateStruct.Month, aDateStruct.Year ); } @@ -662,7 +662,7 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std:: *pBegin == cppu::UnoType<XDataDescriptorFactory>::get())) aOwnTypes.push_back(*pBegin); } - aOwnTypes.push_back(cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get()); + aOwnTypes.push_back(cppu::UnoType<css::lang::XUnoTunnel>::get()); return Sequence< Type >(aOwnTypes.data(), aOwnTypes.size()); } @@ -677,7 +677,7 @@ Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeExcep rType == cppu::UnoType<XDataDescriptorFactory>::get()) return Any(); - const Any aRet = ::cppu::queryInterface(rType,static_cast< ::com::sun::star::lang::XUnoTunnel*> (this)); + const Any aRet = ::cppu::queryInterface(rType,static_cast< css::lang::XUnoTunnel*> (this)); return aRet.hasValue() ? aRet : OTable_TYPEDEF::queryInterface(rType); } @@ -697,7 +697,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index ce0d73cabf73..5c5c0d232fd9 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -69,7 +69,7 @@ Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData( ) throw( return xMetaData; } -::com::sun::star::uno::Reference< XTablesSupplier > ODbaseConnection::createCatalog() +css::uno::Reference< XTablesSupplier > ODbaseConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XTablesSupplier > xTab = m_xCatalog; diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index e6ab32ee71e7..cf0967fcc303 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -47,7 +47,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::dbase::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index 40060a3c3d17..71b638a5ff1d 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -207,7 +207,7 @@ void SAL_CALL ODbaseResultSet::release() throw() ODbaseResultSet_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 391a5edc05a8..e3d518c80f03 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -92,9 +92,9 @@ sal_Size lcl_getFileSize(SvStream& _rStream) /** calculates the Julian date */ -void lcl_CalcJulDate(sal_Int32& _nJulianDate,sal_Int32& _nJulianTime, const com::sun::star::util::DateTime& rDateTime) +void lcl_CalcJulDate(sal_Int32& _nJulianDate,sal_Int32& _nJulianTime, const css::util::DateTime& rDateTime) { - com::sun::star::util::DateTime aDateTime = rDateTime; + css::util::DateTime aDateTime = rDateTime; // weird: months fix if (aDateTime.Month > 12) { @@ -144,7 +144,7 @@ void lcl_CalcJulDate(sal_Int32& _nJulianDate,sal_Int32& _nJulianTime, const com: /** calculates date time from the Julian Date */ -void lcl_CalDate(sal_Int32 _nJulianDate,sal_Int32 _nJulianTime,com::sun::star::util::DateTime& _rDateTime) +void lcl_CalDate(sal_Int32 _nJulianDate,sal_Int32 _nJulianTime,css::util::DateTime& _rDateTime) { if ( _nJulianDate ) { @@ -738,7 +738,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std: aOwnTypes.push_back(*pBegin); } } - aOwnTypes.push_back(cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get()); + aOwnTypes.push_back(cppu::UnoType<css::lang::XUnoTunnel>::get()); return Sequence< Type >(aOwnTypes.data(), aOwnTypes.size()); } @@ -750,7 +750,7 @@ Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeExce return Any(); Any aRet = OTable_TYPEDEF::queryInterface(rType); - return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< ::com::sun::star::lang::XUnoTunnel*> (this)); + return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< css::lang::XUnoTunnel*> (this)); } @@ -769,7 +769,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { @@ -873,7 +873,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool } else { - ::com::sun::star::util::DateTime aDateTime; + css::util::DateTime aDateTime; lcl_CalDate(nDate,nTime,aDateTime); *(_rRow->get())[i] = aDateTime; } @@ -953,7 +953,7 @@ bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool const sal_uInt16 nMonth = (sal_uInt16)aStr.copy( 4, 2 ).toInt32(); const sal_uInt16 nDay = (sal_uInt16)aStr.copy( 6, 2 ).toInt32(); - const ::com::sun::star::util::Date aDate(nDay,nMonth,nYear); + const css::util::Date aDate(nDay,nMonth,nYear); *(_rRow->get())[i] = aDate; } break; @@ -1857,7 +1857,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo break; case DataType::DATE: { - ::com::sun::star::util::Date aDate; + css::util::Date aDate; if(thisColVal.getTypeKind() == DataType::DOUBLE) aDate = ::dbtools::DBTypeConversion::toDate(thisColVal.getDouble()); else @@ -2011,7 +2011,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockNr) // if the BlockNo 0 is given, the block will be appended at the end sal_Size nSize = 0; OString aStr; - ::com::sun::star::uno::Sequence<sal_Int8> aValue; + css::uno::Sequence<sal_Int8> aValue; sal_uInt8 nHeader[4]; const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro; if ( bBinary ) @@ -2160,7 +2160,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref } } -void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2296,7 +2296,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const return getConnection()->getMetaData(); } -void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2352,7 +2352,7 @@ namespace } } -void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -2731,7 +2731,7 @@ bool ODbaseTable::ReadMemo(sal_Size nBlockNo, ORowSetValue& aVariable) } // if ( bIsText ) else { - ::com::sun::star::uno::Sequence< sal_Int8 > aData(nLength); + css::uno::Sequence< sal_Int8 > aData(nLength); m_pMemoStream->Read(aData.getArray(),nLength); aVariable = aData; } diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 5f1501d5f4c3..f50567d18472 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -46,7 +46,7 @@ ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec) } ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec) - : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) + : ONDXKey_BASE(css::sdbc::DataType::VARCHAR) ,nRecord(nRec) { if (!aStr.isEmpty()) @@ -58,7 +58,7 @@ ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec) ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec) - : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE) + : ONDXKey_BASE(css::sdbc::DataType::DOUBLE) ,nRecord(nRec) ,xValue(aVal) { diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index 375bed11352f..27297e657322 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -30,7 +30,7 @@ namespace connectivity class OEvoabCatalog : public connectivity::sdbcx::OCatalog { OEvoabConnection *m_pConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; public: explicit OEvoabCatalog(OEvoabConnection *_pCon); inline OEvoabConnection* getConnection() const { return m_pConnection; } @@ -39,8 +39,8 @@ namespace connectivity virtual void refreshGroups() override {} virtual void refreshUsers() override {} // 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; }; } } diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index 175c74bc2e45..d405efb83b10 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity OEvoabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: OEvoabColumns( OEvoabTable* _pTable, diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index bba1d92c3f85..d3bcb54b920a 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -121,7 +121,7 @@ Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( ) throw( return xMetaData; } -::com::sun::star::uno::Reference< XTablesSupplier > OEvoabConnection::createCatalog() +css::uno::Reference< XTablesSupplier > OEvoabConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XTablesSupplier > xTab = m_xCatalog; @@ -243,12 +243,12 @@ sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation( ) throw(SQLExcept return TransactionIsolation::NONE; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::getTypeMap", *this ); return nullptr; } -void SAL_CALL OEvoabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 97915dcff555..dd77b00bd6ff 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -56,16 +56,16 @@ namespace connectivity private: const OEvoabDriver& m_rDriver; SDBCAddress::sdbc_address_type m_eSDBCAddressType; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > + css::uno::Reference< css::sdbcx::XTablesSupplier > m_xCatalog; - OString m_aPassword; + OString m_aPassword; ::dbtools::WarningsContainer m_aWarnings; virtual ~OEvoabConnection(); public: explicit OEvoabConnection( OEvoabDriver& _rDriver ); - virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); + virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) throw( css::sdbc::SQLException); inline OString const & getPassword() { return m_aPassword; } inline void setPassword( OString const & aStr ) { m_aPassword = aStr; } @@ -84,31 +84,31 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); - 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( 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( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) 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 void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - 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; + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 7e0781cef541..610dda0eedd7 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -67,7 +67,7 @@ namespace connectivity ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString& columnNamePattern ); protected: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() override; + virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override; // cached database information virtual OUString impl_getIdentifierQuoteString_throw( ) override; virtual bool impl_isCatalogAtStart_throw( ) override; @@ -91,129 +91,129 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - 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 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 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 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 supportsSchemasInProcedureCalls( ) 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 supportsCatalogsInProcedureCalls( ) 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 getMaxTableNameLength( ) 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 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 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 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 sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + + virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index d9783dabc84a..d4a7baa033cd 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -65,7 +65,7 @@ void OEvoabDriver::disposing() { xComp->dispose(); } - catch (const com::sun::star::lang::DisposedException&) + catch (const css::lang::DisposedException&) { xComp.clear(); } @@ -111,7 +111,7 @@ Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(R } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) { return *(new OEvoabDriver(_rxFactory)); } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index a8076e608032..6372a80b4d02 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -34,11 +34,11 @@ namespace connectivity namespace evoab { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); + css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::lang::XServiceInfo > ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, + css::lang::XServiceInfo > ODriver_BASE; class OEvoabDriver : public ODriver_BASE @@ -47,36 +47,36 @@ namespace connectivity protected: ::osl::Mutex m_aMutex; connectivity::OWeakRefArray m_xConnections; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; public: - explicit OEvoabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + explicit OEvoabDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); virtual ~OEvoabDriver(); // OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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 css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; public: - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + const css::uno::Reference< css::lang::XMultiServiceFactory > & getMSFactory() const { return m_xFactory; } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); } // static methods diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index bce0b9551982..73e62583d0a7 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -36,11 +36,11 @@ namespace connectivity namespace evoab { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::sdbc::XMultipleResults, - ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; + typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XResultSetMetaDataSupplier, + css::sdbc::XMultipleResults, + css::lang::XServiceInfo> OPreparedStatement_BASE; class OEvoabPreparedStatement :public OCommonStatement ,public OPreparedStatement_BASE @@ -48,11 +48,10 @@ namespace connectivity protected: struct Parameter { - ::com::sun::star::uno::Any aValue; + css::uno::Any aValue; sal_Int32 nDataType; - Parameter(const ::com::sun::star::uno::Any& rValue, - sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) + Parameter(const css::uno::Any& rValue, sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) { } @@ -64,11 +63,11 @@ namespace connectivity // our SQL statement - OUString m_sSqlStatement; + OUString m_sSqlStatement; // the EBookQuery we're working with - QueryData m_aQueryData; + QueryData m_aQueryData; // our meta data - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; protected: virtual ~OEvoabPreparedStatement(); @@ -81,49 +80,49 @@ namespace connectivity protected: DECLARE_SERVICE_INFO(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // 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 sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; - 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; - 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; - 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; - 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; - 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; - 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; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - 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; - 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; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - 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; - 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; - 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; - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // 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 sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index bc5ca27bbf3c..58ea03305025 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -811,7 +811,7 @@ Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) t return nullptr; } -Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this ); return Any(); @@ -823,16 +823,16 @@ sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) throw(S return 0; } -::com::sun::star::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTime", *this ); - return ::com::sun::star::util::Time(); + return css::util::Time(); } util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTimestamp", *this ); - return ::com::sun::star::util::DateTime(); + return css::util::DateTime(); } Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) @@ -859,10 +859,10 @@ Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum* return Sequence< sal_Int8 >(); } -::com::sun::star::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getDate", *this ); - return ::com::sun::star::util::Date(); + return css::util::Date(); } double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) @@ -1037,7 +1037,7 @@ Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) throw(SQLExce { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); -::com::sun::star::uno::WeakReferenceHelper aStatement(static_cast<OWeakObject*>(m_pStatement)); +css::uno::WeakReferenceHelper aStatement(static_cast<OWeakObject*>(m_pStatement)); return aStatement.get(); } @@ -1155,8 +1155,8 @@ void SAL_CALL OEvoabResultSet::release() throw() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL -OEvoabResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL +OEvoabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index d0e358aeeb2a..efec457c6e30 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -63,14 +63,14 @@ namespace connectivity virtual ~OEvoabVersionHelper() {} }; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet - , ::com::sun::star::sdbc::XRow - , ::com::sun::star::sdbc::XResultSetMetaDataSupplier - , ::com::sun::star::util::XCancellable - , ::com::sun::star::sdbc::XWarningsSupplier - , ::com::sun::star::sdbc::XCloseable - , ::com::sun::star::sdbc::XColumnLocate - , ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet + , css::sdbc::XRow + , css::sdbc::XResultSetMetaDataSupplier + , css::util::XCancellable + , css::sdbc::XWarningsSupplier + , css::sdbc::XCloseable + , css::sdbc::XColumnLocate + , css::lang::XServiceInfo > OResultSet_BASE; @@ -84,11 +84,11 @@ namespace connectivity protected: - OCommonStatement* m_pStatement; - OEvoabConnection* m_pConnection; - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; - rtl::Reference<OEvoabResultSetMetaData> m_xMetaData; - ::dbtools::WarningsContainer m_aWarnings; + OCommonStatement* m_pStatement; + OEvoabConnection* m_pConnection; + css::uno::WeakReferenceHelper m_aStatement; + rtl::Reference<OEvoabResultSetMetaData> m_xMetaData; + ::dbtools::WarningsContainer m_aWarnings; bool m_bWasNull; // <properties> @@ -121,72 +121,72 @@ namespace connectivity OEvoabConnection * getConnection() { return m_pConnection; } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() + css::uno::Reference< css::uno::XInterface > operator *() { - return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast<OResultSet_BASE*>(this)); + return css::uno::Reference< css::uno::XInterface >(*static_cast<OResultSet_BASE*>(this)); } // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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( 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; + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index b985650ed319..4f742a625899 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -151,7 +151,7 @@ sal_Int32 SAL_CALL OEvoabResultSetMetaData::getPrecision( sal_Int32 /*nColumnNum return 0; } -sal_Int32 SAL_CALL OEvoabResultSetMetaData::getScale( sal_Int32 /*nColumnNum*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSetMetaData::getScale( sal_Int32 /*nColumnNum*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return 0; } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 1a514887f593..4fa89e261897 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -32,7 +32,7 @@ namespace connectivity //************ Class: ResultSetMetaData - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OEvoabResultSetMetaData : public OResultSetMetaData_BASE { @@ -43,36 +43,36 @@ namespace connectivity virtual ~OEvoabResultSetMetaData(); public: explicit OEvoabResultSetMetaData(const OUString& _aTableName); - void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException); + void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } inline sal_Int32 getFieldSize() const {return m_aEvoabFields.size();} /// Avoid ambigous cast error from the compiler. - inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() + inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } - 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/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index 79ccd2f73a6e..eacc2d63a2d0 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -66,7 +66,7 @@ struct ProviderRequest { xRet = creator( xServiceManager, sImplementationName,Factory, Services,nullptr); } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { OSL_FAIL("Service Creation Exception"); } diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 74695da2e4c5..4356b352c089 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -48,8 +48,8 @@ namespace connectivity { namespace evoab { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XWarningsSupplier - , ::com::sun::star::sdbc::XCloseable + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XWarningsSupplier + , css::sdbc::XCloseable > OCommonStatement_IBase; struct FieldSort @@ -146,7 +146,7 @@ namespace connectivity friend class OSubComponent< OCommonStatement, OCommonStatement_IBase >; private: - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created + css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created OEvoabConnection *m_pConnection; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; @@ -186,7 +186,7 @@ namespace connectivity // other methods OEvoabConnection* getOwnConnection() const { return m_pConnection;} - using OCommonStatement_IBase::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + using OCommonStatement_IBase::operator css::uno::Reference< css::uno::XInterface >; protected: explicit OCommonStatement( OEvoabConnection* _pConnection ); @@ -197,19 +197,19 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; protected: /** will return the EBookQuery representing the statement WHERE condition, or throw @@ -219,21 +219,21 @@ namespace connectivity QueryData impl_getEBookQuery_throw( const OUString& _rSql ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > impl_executeQuery_throw( const OUString& _rSql ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > impl_executeQuery_throw( const QueryData& _rData ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - impl_getConnection() { return ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >( m_pConnection ); } + css::uno::Reference< css::sdbc::XConnection > + impl_getConnection() { return css::uno::Reference< css::sdbc::XConnection >( m_pConnection ); } OUString impl_getColumnRefColumnName_throw( const ::connectivity::OSQLParseNode& _rColumnRef ); }; - typedef ::cppu::ImplHelper2 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::sdbc::XStatement + typedef ::cppu::ImplHelper2 < css::lang::XServiceInfo + , css::sdbc::XStatement > OStatement_IBase; class OStatement :public OCommonStatement ,public OStatement_IBase @@ -248,7 +248,7 @@ namespace connectivity } // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -259,10 +259,10 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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 ; - 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 ; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; }; } } diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx index 27e2c86db2ad..4d0a4ea88b69 100644 --- a/connectivity/source/drivers/evoab2/NTable.hxx +++ b/connectivity/source/drivers/evoab2/NTable.hxx @@ -31,7 +31,7 @@ namespace connectivity class OEvoabTable : public OEvoabTable_TYPEDEF { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; OEvoabConnection* m_pConnection; public: diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 692a881a8ebd..1977863cb38c 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -27,12 +27,12 @@ namespace connectivity { class OEvoabTables : public sdbcx::OCollection { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: - OEvoabTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData, + OEvoabTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent,true,_rMutex,_rVector), diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index bf1c7ce628d4..41a6784b95e8 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -32,7 +32,7 @@ ORowSetValue OOp_DayOfWeek::operate(const ORowSetValue& lhs) const return lhs; sal_Int32 nRet = 0; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); DayOfWeek eDayOfWeek = aDate.GetDayOfWeek(); switch(eDayOfWeek) @@ -69,7 +69,7 @@ ORowSetValue OOp_DayOfMonth::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; return static_cast<sal_Int16>(aD.Day); } @@ -78,7 +78,7 @@ ORowSetValue OOp_DayOfYear::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); return static_cast<sal_Int16>(aDate.GetDayOfYear()); } @@ -88,7 +88,7 @@ ORowSetValue OOp_Month::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; return static_cast<sal_Int16>(aD.Month); } @@ -98,7 +98,7 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const return lhs; OUString sRet; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); DayOfWeek eDayOfWeek = aDate.GetDayOfWeek(); switch(eDayOfWeek) @@ -136,7 +136,7 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const return lhs; OUString sRet; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; switch(aD.Month) { case 1: @@ -185,7 +185,7 @@ ORowSetValue OOp_Quarter::operate(const ORowSetValue& lhs) const return lhs; sal_Int32 nRet = 1; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; if ( aD.Month >= 4 && aD.Month < 7 ) nRet = 2; else if ( aD.Month >= 7 && aD.Month < 10 ) @@ -202,7 +202,7 @@ ORowSetValue OOp_Week::operate(const ::std::vector<ORowSetValue>& lhs) const size_t nSize = lhs.size(); - ::com::sun::star::util::Date aD = lhs[nSize-1]; + css::util::Date aD = lhs[nSize-1]; Date aDate(aD.Day,aD.Month,aD.Year); sal_Int16 nStartDay = SUNDAY; @@ -217,7 +217,7 @@ ORowSetValue OOp_Year::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::com::sun::star::util::Date aD = lhs; + css::util::Date aD = lhs; return static_cast<sal_Int16>(aD.Year); } @@ -226,7 +226,7 @@ ORowSetValue OOp_Hour::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::com::sun::star::util::Time aT = lhs; + css::util::Time aT = lhs; return static_cast<sal_Int16>(aT.Hours); } @@ -235,7 +235,7 @@ ORowSetValue OOp_Minute::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::com::sun::star::util::Time aT = lhs; + css::util::Time aT = lhs; return static_cast<sal_Int16>(aT.Minutes); } @@ -244,7 +244,7 @@ ORowSetValue OOp_Second::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::com::sun::star::util::Time aT = lhs; + css::util::Time aT = lhs; return static_cast<sal_Int16>(aT.Seconds); } diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 4a47b4a391de..15432f740523 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; using namespace com::sun::star::container; -OFileDriver::OFileDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) +OFileDriver::OFileDriver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext) : ODriver_BASE(m_aMutex) ,m_xContext(_rxContext) { @@ -184,13 +184,13 @@ sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException, std: // XDataDefinitionSupplier -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriver_BASE::rBHelper.bDisposed); Reference< XTablesSupplier > xTab = nullptr; - Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY); + Reference< css::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY); if(xTunnel.is()) { OConnection* pSearchConnection = reinterpret_cast< OConnection* >( xTunnel->getSomething(OConnection::getUnoTunnelImplementationId()) ); @@ -211,7 +211,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection } -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { if ( ! acceptsURL(url) ) { diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 65806cdb5d02..bf8e38b8f1a7 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -117,7 +117,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt static_cast< XResultSetMetaDataSupplier*>(this)); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(), cppu::UnoType<XParameters>::get(), @@ -339,13 +339,13 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { setBinaryStream(parameterIndex,x,length ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index baa6cca0117c..0a5ffb0a0e2d 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star::container; namespace { - void lcl_throwError(sal_uInt16 _nErrorId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext) + void lcl_throwError(sal_uInt16 _nErrorId,const css::uno::Reference< css::uno::XInterface>& _xContext) { ::connectivity::SharedResources aResources; const OUString sMessage = aResources.getResourceString(_nErrorId); @@ -175,9 +175,9 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std:: { ::osl::MutexGuard aGuard( m_aMutex ); - OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } @@ -217,19 +217,19 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex) return *(m_aSelectRow->get())[columnIndex]; } -void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException) +void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException) { if ( columnIndex <= 0 || columnIndex >= m_nColumnCount ) ::dbtools::throwInvalidIndexException(*this); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return nullptr; } @@ -253,7 +253,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro } -::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } @@ -328,7 +328,7 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex).makeAny(); } @@ -344,12 +344,12 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept return getValue(columnIndex); } -::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } @@ -698,25 +698,25 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -729,7 +729,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { updateBinaryStream(columnIndex,x,length); } @@ -1424,7 +1424,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { @@ -1561,7 +1561,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index 21aeeedf25fa..d1c612d50e70 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index d37f1576a067..287c4fbf4e28 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -162,9 +162,9 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception) { - ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); } @@ -308,7 +308,7 @@ void SAL_CALL OStatement_Base::disposing() OStatement_BASE::disposing(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -421,7 +421,7 @@ void OStatement_Base::construct(const OUString& sql) throw(SQLException, Runtim } // at this moment we support only one table per select statement - Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(rTabs.begin()->second,UNO_QUERY); + Reference< css::lang::XUnoTunnel> xTunnel(rTabs.begin()->second,UNO_QUERY); if(xTunnel.is()) { if(m_pTable) diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 3cc579f3ab02..2720c1fdf2a8 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -139,7 +139,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { @@ -175,7 +175,7 @@ void SAL_CALL OFileTable::release() throw() OTable_TYPEDEF::release(); } -bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/) +bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, const css::uno::Reference< css::container::XIndexAccess>& /*_xCols*/) { return false; } @@ -185,12 +185,12 @@ bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/) return false; } -bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/) +bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const css::uno::Reference< css::container::XIndexAccess>& /*_xCols*/) { return false; } -void OFileTable::addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& /*descriptor*/) +void OFileTable::addColumn(const css::uno::Reference< css::beans::XPropertySet>& /*descriptor*/) { OSL_FAIL( "OFileTable::addColumn: not implemented!" ); } diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 1b886ed20a20..c89abee7a894 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -437,7 +437,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr ) ); ::dbtools::throwGenericSQLException( sError, nullptr ); } - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xCol; + css::uno::Reference< css::beans::XPropertySet> xCol; try { if (m_orgColumns->getByName(aColumnName) >>= xCol) diff --git a/connectivity/source/drivers/firebird/Blob.hxx b/connectivity/source/drivers/firebird/Blob.hxx index 40617462f94b..89daeac839ff 100644 --- a/connectivity/source/drivers/firebird/Blob.hxx +++ b/connectivity/source/drivers/firebird/Blob.hxx @@ -21,8 +21,8 @@ namespace connectivity { namespace firebird { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XBlob, - ::com::sun::star::io::XInputStream > + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XBlob, + css::io::XInputStream > Blob_BASE; class Blob : @@ -46,13 +46,13 @@ namespace connectivity ISC_STATUS_ARRAY m_statusVector; void ensureBlobIsOpened() - throw(::com::sun::star::sdbc::SQLException); + throw(css::sdbc::SQLException); /** * Closes the blob and cleans up resources -- can be used to reset * the blob if we e.g. want to read from the beginning again. */ void closeBlob() - throw(::com::sun::star::sdbc::SQLException); + throw(css::sdbc::SQLException); public: Blob(isc_db_handle* pDatabaseHandle, @@ -62,58 +62,58 @@ namespace connectivity // ---- XBlob ---------------------------------------------------- virtual sal_Int64 SAL_CALL length() - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int64 aPosition, sal_Int32 aLength) - 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 + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream() - 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 - position(const ::com::sun::star::uno::Sequence< sal_Int8 >& rPattern, + position(const css::uno::Sequence< sal_Int8 >& rPattern, sal_Int64 aStart) - 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 - positionOfBlob(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rPattern, + positionOfBlob(const css::uno::Reference< css::sdbc::XBlob >& rPattern, sal_Int64 aStart) - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // ---- XInputStream ---------------------------------------------- virtual sal_Int32 SAL_CALL - readBytes(::com::sun::star::uno::Sequence< sal_Int8 >& rDataOut, + readBytes(css::uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 nBytes) - throw(::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL - readSomeBytes(::com::sun::star::uno::Sequence< sal_Int8 >& rDataOut, + readSomeBytes(css::uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 nMaximumBytes) - throw(::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes(sal_Int32 nBytes) - throw(::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL available() - throw(::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeInput() - throw(::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException, std::exception) override; // ---- OComponentHelper ------------------------------------------ virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/firebird/Catalog.hxx b/connectivity/source/drivers/firebird/Catalog.hxx index 32a2f317e8e6..351069c80a72 100644 --- a/connectivity/source/drivers/firebird/Catalog.hxx +++ b/connectivity/source/drivers/firebird/Catalog.hxx @@ -19,11 +19,11 @@ namespace connectivity class Catalog: public ::connectivity::sdbcx::OCatalog { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > + css::uno::Reference< css::sdbc::XConnection > m_xConnection; public: - explicit Catalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rConnection); + explicit Catalog(const css::uno::Reference< css::sdbc::XConnection >& rConnection); // OCatalog virtual void refreshTables() override; diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 7f4d2a81d62d..4f825709604c 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -764,7 +764,7 @@ void Connection::disposing() disposeStatements(); - m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); + m_xMetaData = css::uno::WeakReference< css::sdbc::XDatabaseMetaData>(); ISC_STATUS_ARRAY status; /* status vector */ if (m_aTransactionHandle) diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 37c5b83bc3f8..b1dd5f307e55 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -52,10 +52,10 @@ namespace connectivity namespace firebird { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XDocumentEventListener, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::sdbc::XConnection, - ::com::sun::star::sdbc::XWarningsSupplier + typedef ::cppu::WeakComponentImplHelper< css::document::XDocumentEventListener, + css::lang::XServiceInfo, + css::sdbc::XConnection, + css::sdbc::XWarningsSupplier > Connection_BASE; class OStatementCommonBase; @@ -64,7 +64,7 @@ namespace connectivity typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; - typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; + typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; class Connection : public Connection_BASE, public connectivity::OSubComponent<Connection, Connection_BASE> @@ -105,14 +105,14 @@ namespace connectivity * * Note that this is ONLY set in embedded mode. */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > + css::uno::Reference< css::util::XModifiable > m_xParentDocument; /** * Handle for the folder within the .odb where we store our .fdb * (Only used if m_bIsEmbedded is true). */ - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + css::uno::Reference< css::embed::XStorage > m_xEmbeddedStorage; /** * The temporary folder where we extract the .fdb from a .odb. @@ -132,10 +132,10 @@ namespace connectivity isc_db_handle m_aDBHandle; isc_tr_handle m_aTransactionHandle; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> - m_xCatalog; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > - m_xMetaData; + css::uno::WeakReference< css::sdbcx::XTablesSupplier> + m_xCatalog; + css::uno::WeakReference< css::sdbc::XDatabaseMetaData > + m_xMetaData; /** Statements owned by this connection. */ OWeakRefArray m_aStatements; @@ -156,7 +156,7 @@ namespace connectivity * anytime we change the transaction isolation, or autocommiting. */ void setupTransaction() - throw(::com::sun::star::sdbc::SQLException); + throw(css::sdbc::SQLException); void disposeStatements(); /** transform named parameters into unnamed parameters @@ -172,7 +172,7 @@ namespace connectivity virtual ~Connection(); void construct( const ::rtl::OUString& url, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) + const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); @@ -181,7 +181,7 @@ namespace connectivity bool isEmbedded() const {return m_bIsEmbedded;} isc_db_handle& getDBHandle() {return m_aDBHandle;} isc_tr_handle& getTransaction() - throw(::com::sun::star::sdbc::SQLException); + throw(css::sdbc::SQLException); /** * Must be called anytime the underlying database is likely to have @@ -198,16 +198,16 @@ namespace connectivity * transaction and not to a statement, hence the connection should * deal with their management. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob> + css::uno::Reference< css::sdbc::XBlob> createBlob(ISC_QUAD* pBlobID) - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + throw(css::sdbc::SQLException, + css::uno::RuntimeException); /** * Create and/or connect to the sdbcx Catalog. This is completely * unrelated to the SQL "Catalog". */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > + css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); // OComponentHelper @@ -218,33 +218,33 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // 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( const ::rtl::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( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) 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 void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - 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; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; // css.lang.XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index 284a4d424273..afd069855d9d 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -33,7 +33,7 @@ namespace connectivity //************ Class: ODatabaseMetaData - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; + typedef ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; class ODatabaseMetaData : public ODatabaseMetaData_BASE { @@ -45,155 +45,155 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - 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 ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::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 ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::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 ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::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 ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::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 ::rtl::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 ::rtl::OUString& schemaPattern, const ::rtl::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 ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::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 ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::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 ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::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 ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::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 ::rtl::OUString& schemaPattern, const ::rtl::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 ::rtl::OUString& schema, const ::rtl::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 ::rtl::OUString& schema, const ::rtl::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 ::rtl::OUString& schema, const ::rtl::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 ::rtl::OUString& schema, const ::rtl::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 ::rtl::OUString& schema, const ::rtl::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 ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::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 ::rtl::OUString& schema, const ::rtl::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 ::rtl::OUString& schemaPattern, const ::rtl::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 ::rtl::OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 24054ab4e9fe..6b87abe714e0 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -62,7 +62,7 @@ const OUString FirebirdDriver::our_sFirebirdTmpVar("FIREBIRD_TMP"); const OUString FirebirdDriver::our_sFirebirdLockVar("FIREBIRD_LOCK"); const OUString FirebirdDriver::our_sFirebirdMsgVar("FIREBIRD_MSG"); -FirebirdDriver::FirebirdDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) +FirebirdDriver::FirebirdDriver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext) : ODriver_BASE(m_aMutex) , m_aContext(_rxContext) , m_firebirdTMPDirectory(nullptr, true) diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index 4c6a6e1f8b6d..64eeb53839c6 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -38,11 +38,11 @@ namespace connectivity // 3: Is IB6 -- minimum required for delimited identifiers. static const int FIREBIRD_SQL_DIALECT = 3; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception, std::exception ); + css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception, std::exception ); - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::sdbcx::XDataDefinitionSupplier, - ::com::sun::star::lang::XServiceInfo > ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, + css::sdbcx::XDataDefinitionSupplier, + css::lang::XServiceInfo > ODriver_BASE; class FirebirdDriver : public ODriver_BASE { @@ -63,40 +63,40 @@ namespace connectivity public: - explicit FirebirdDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + explicit FirebirdDriver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); virtual ~FirebirdDriver(); const css::uno::Reference<css::uno::XComponentContext>& getContext() const { return m_aContext; } // OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static ::rtl::OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::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; - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::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; - 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 css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; // XDataDefinitionSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rxConnection) - 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 > + const css::uno::Reference< css::sdbc::XConnection >& rxConnection) + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& rsURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rInfo) - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rInfo) + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 4ecb9b7d05d9..bce48fb312df 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -623,7 +623,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -634,7 +634,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index e0711a7ecaf6..72e90d59da07 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -38,37 +38,37 @@ namespace connectivity { class OBoundParam; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XPreparedBatchExecution, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::lang::XServiceInfo> OPreparedStatement_Base; + typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XPreparedBatchExecution, + css::sdbc::XResultSetMetaDataSupplier, + css::lang::XServiceInfo> OPreparedStatement_Base; class OPreparedStatement : public OStatementCommonBase, public OPreparedStatement_Base { protected: - ::rtl::OUString m_sSqlStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + ::rtl::OUString m_sSqlStatement; + css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; XSQLDA* m_pOutSqlda; XSQLDA* m_pInSqlda; void checkParameterIndex(sal_Int32 nParameterIndex) - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + throw(css::sdbc::SQLException, + css::uno::RuntimeException); /** * Set a numeric value in the input SQLDA. If the destination * parameter is not of nType then an Exception will be thrown. */ template <typename T> void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + throw(css::sdbc::SQLException, + css::uno::RuntimeException); void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = true); void ensurePrepared() - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + throw(css::sdbc::SQLException, + css::uno::RuntimeException); /** * Assumes that all necessary mutexes have been taken. */ @@ -80,8 +80,8 @@ namespace connectivity protected: 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; virtual ~OPreparedStatement(); public: DECLARE_SERVICE_INFO(); @@ -90,90 +90,90 @@ namespace connectivity const ::rtl::OUString& sql); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPreparedStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() - 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() - 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 + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::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; // XParameters virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::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 setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) - throw(::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 nIndex, sal_Int8 nValue) - 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 nIndex, sal_Int16 nValue) - 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 nIndex, sal_Int32 nValue) - 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 nIndex, sal_Int64 nValue) - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::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; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - 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; - 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; - 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; - 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; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XPreparedBatchExecution -- UNSUPPORTED by firebird virtual void SAL_CALL addBatch() - 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 clearBatch() - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() - throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::sdbc::SQLException, + css::uno::RuntimeException, std::exception) override; // 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; // OComponentHelper virtual void SAL_CALL disposing() override; // 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; }; } diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index acfeb8b2998c..bd9179e23149 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -62,9 +62,9 @@ OResultSet::OResultSet(Connection* pConnection, , OPropertyContainer(OResultSet_BASE::rBHelper) , m_bIsBookmarkable(false) , m_nFetchSize(1) - , m_nResultSetType(::com::sun::star::sdbc::ResultSetType::FORWARD_ONLY) - , m_nFetchDirection(::com::sun::star::sdbc::FetchDirection::FORWARD) - , m_nResultSetConcurrency(::com::sun::star::sdbc::ResultSetConcurrency::READ_ONLY) + , m_nResultSetType(css::sdbc::ResultSetType::FORWARD_ONLY) + , m_nFetchDirection(css::sdbc::FetchDirection::FORWARD) + , m_nResultSetConcurrency(css::sdbc::ResultSetConcurrency::READ_ONLY) , m_pConnection(pConnection) , m_rMutex(rMutex) , m_xStatement(xStatement) @@ -684,7 +684,7 @@ uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) thro } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; (void) typeMap; @@ -789,7 +789,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index dd9a89704f36..e5ae03af98f2 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -50,16 +50,16 @@ namespace connectivity /* ** OResultSet */ - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet, + css::sdbc::XRow, + css::sdbc::XResultSetMetaDataSupplier, + css::util::XCancellable, #if 0 - ::com::sun::star::sdbc::XWarningsSupplier, + css::sdbc::XWarningsSupplier, #endif - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + css::sdbc::XCloseable, + css::sdbc::XColumnLocate, + css::lang::XServiceInfo> OResultSet_BASE; /** * This ResultSet does not deal with the management of the SQLDA @@ -82,9 +82,9 @@ namespace connectivity // Connection kept alive by m_xStatement Connection* m_pConnection; ::osl::Mutex& m_rMutex; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& m_xStatement; + const css::uno::Reference< css::uno::XInterface >& m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; XSQLDA* m_pSqlda; isc_stmt_handle m_statementHandle; @@ -111,11 +111,11 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; void SAL_CALL checkColumnIndex( sal_Int32 index ) - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + throw (css::sdbc::SQLException, + css::uno::RuntimeException); void SAL_CALL checkRowIndex() - throw (::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + throw (css::sdbc::SQLException, + css::uno::RuntimeException); // you can't delete objects of this type virtual ~OResultSet(); @@ -124,81 +124,81 @@ namespace connectivity OResultSet(Connection* pConnection, ::osl::Mutex& rMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xStatement, + const css::uno::Reference< css::uno::XInterface >& xStatement, isc_stmt_handle& aStatementHandle, XSQLDA* aSqlda); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type& rType) + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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( 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; + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XWarningsSupplier #if 0 - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; #endif // XColumnLocate virtual sal_Int32 SAL_CALL findColumn(const ::rtl::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; }; // Specialisations have to be in the namespace and can't be within the class. - template <> ::com::sun::star::util::Date + template <> css::util::Date OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); @@ -206,11 +206,11 @@ namespace connectivity OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); - template <> ::com::sun::star::util::Time + template <> css::util::Time OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); - template <> ::com::sun::star::util::DateTime + template <> css::util::DateTime OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 05cd8a7db10f..e76be244a9f8 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -164,7 +164,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) + throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return m_pSqlda->sqlvar[column-1].sqlscale; } diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx index 7047abc03f29..4df534ab39c4 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx @@ -32,7 +32,7 @@ namespace connectivity { namespace firebird { - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> + typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE @@ -43,7 +43,7 @@ namespace connectivity virtual ~OResultSetMetaData(); - void verifyValidColumn(sal_Int32 column) throw(::com::sun::star::sdbc::SQLException); + void verifyValidColumn(sal_Int32 column) throw(css::sdbc::SQLException); public: // a constructor, which is required for returning objects: OResultSetMetaData(Connection* pConnection, @@ -53,47 +53,47 @@ namespace connectivity {} virtual sal_Int32 SAL_CALL getColumnCount() - 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 isAutoIncrement(sal_Int32 column) - 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 isCaseSensitive(sal_Int32 column) - 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 isSearchable(sal_Int32 column) - 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 isCurrency(sal_Int32 column) - 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 isNullable(sal_Int32 column) - 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 isSigned(sal_Int32 column) - 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 getColumnDisplaySize(sal_Int32 column) - 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 ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) - 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 ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) - 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 ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) - 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 getPrecision(sal_Int32 column) - 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 getScale(sal_Int32 column) - 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 ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) - 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 ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) - 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 getColumnType(sal_Int32 column) - 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 ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) - 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(sal_Int32 column) - 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 isWritable(sal_Int32 column) - 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 isDefinitelyWritable(sal_Int32 column) - 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 ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) - 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/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index e2c5b3116472..d08566579163 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -29,13 +29,13 @@ namespace connectivity namespace firebird { - typedef ::cppu::ImplHelper1< ::com::sun::star::sdbc::XStatement > + typedef ::cppu::ImplHelper1< css::sdbc::XStatement > OStatement_Base; class OStatement : public OStatementCommonBase, public OStatement_Base, - public ::com::sun::star::sdbc::XBatchExecution, - public ::com::sun::star::lang::XServiceInfo + public css::sdbc::XBatchExecution, + public css::lang::XServiceInfo { protected: virtual ~OStatement(){} @@ -57,36 +57,36 @@ namespace connectivity virtual void SAL_CALL release() throw() override; // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const ::rtl::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 ::rtl::OUString& sqlIn) - 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 ::rtl::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 + throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::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; // XBatchExecution - UNSUPPORTED - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL - queryInterface(const ::com::sun::star::uno::Type & rType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL + queryInterface(const css::uno::Type & rType) + throw(css::uno::RuntimeException, std::exception) override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; // 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; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 85af7aa9fd1f..d1208e892a5e 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -261,25 +261,25 @@ void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeE Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), PROPERTY_ID_USEBOOKMARKS, cppu::UnoType<bool>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -358,7 +358,7 @@ void SAL_CALL OStatementCommonBase::release() throw() OStatementCommonBase_Base::release(); } -uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) +uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index 1a7ccc0fdc5c..b4d25775d6ea 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -42,10 +42,10 @@ namespace connectivity namespace firebird { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XMultipleResults> OStatementCommonBase_Base; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XWarningsSupplier, + css::util::XCancellable, + css::sdbc::XCloseable, + css::sdbc::XMultipleResults> OStatementCommonBase_Base; class OStatementCommonBase : public OStatementCommonBase_Base, public ::cppu::OPropertySetHelper, @@ -55,7 +55,7 @@ namespace connectivity protected: ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created + css::uno::Reference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement ::rtl::Reference<Connection> m_pConnection; @@ -66,7 +66,7 @@ namespace connectivity protected: virtual void disposeResultSet(); void freeStatementHandle() - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -74,35 +74,35 @@ namespace connectivity using OPropertySetHelper::getFastPropertyValue; 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; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle) const override; virtual ~OStatementCommonBase(); void prepareAndDescribeStatement(const OUString& sqlIn, XSQLDA*& pOutSqlda, XSQLDA* pInSqlda=nullptr) - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); short getSqlInfoItem(char aInfoItem) - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); bool isDDLStatement() - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); sal_Int32 getStatementChangeCount() - throw (::com::sun::star::sdbc::SQLException); + throw (css::sdbc::SQLException); public: explicit OStatementCommonBase(Connection* _pConnection); - using OStatementCommonBase_Base::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + using OStatementCommonBase_Base::operator css::uno::Reference< css::uno::XInterface >; // OComponentHelper virtual void SAL_CALL disposing() override { @@ -113,25 +113,25 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XWarningsSupplier - UNSUPPORTED - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XMultipleResults - UNSUPPORTED - 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 sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index ba34a19914c4..7a86cf196864 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -52,10 +52,10 @@ namespace connectivity { void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, - ::com::sun::star::lang::XComponent* _pObject); + css::uno::Reference< css::uno::XInterface >& _xInterface, + css::lang::XComponent* _pObject); - void checkDisposed(bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); + void checkDisposed(bool _bThrow) throw ( css::lang::DisposedException ); template <class TYPE> diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx index ba65e1ff2eee..7ea9f48734f8 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -41,10 +41,10 @@ namespace connectivity public: Table(Tables* pTables, ::osl::Mutex& rMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); + const css::uno::Reference< css::sdbc::XConnection >& _xConnection); Table(Tables* pTables, ::osl::Mutex& rMutex, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const ::rtl::OUString& rName, const ::rtl::OUString& rType, const ::rtl::OUString& rDescription); @@ -59,31 +59,31 @@ namespace connectivity // XAlterTable /** - * See ::com::sun::star::sdbcx::ColumnDescriptor for details of + * See css::sdbcx::ColumnDescriptor for details of * rDescriptor. */ virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& rColName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rDescriptor) - 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 >& rDescriptor) + throw(css::sdbc::SQLException, + css::container::NoSuchElementException, + css::uno::RuntimeException, std::exception) override; // XRename -- UNSUPPORTED virtual void SAL_CALL rename(const ::rtl::OUString& sName) - 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; //XInterface - virtual ::com::sun::star::uno::Any - SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any + SAL_CALL queryInterface(const css::uno::Type & rType) + throw(css::uno::RuntimeException, std::exception) override; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException, std::exception) override; + throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index f58d2a6e7f78..5fc5397537f4 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -26,22 +26,22 @@ namespace connectivity class Tables: public ::connectivity::sdbcx::OCollection { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // OCollection virtual void impl_refresh() - throw(::com::sun::star::uno::RuntimeException) override; + throw(css::uno::RuntimeException) override; virtual ::connectivity::sdbcx::ObjectType createObject( const ::rtl::OUString& rName) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; virtual ::connectivity::sdbcx::ObjectType appendObject( const OUString& rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rDescriptor) override; + const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override; public: - Tables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& rMetaData, + Tables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& rMetaData, ::cppu::OWeakObject& rParent, ::osl::Mutex& rMutex, ::connectivity::TStringVector& rNames) : sdbcx::OCollection(rParent, true, rMutex, rNames), m_xMetaData(rMetaData) {} diff --git a/connectivity/source/drivers/firebird/User.hxx b/connectivity/source/drivers/firebird/User.hxx index 74f01d8f0dd1..3d2e8db0ea41 100644 --- a/connectivity/source/drivers/firebird/User.hxx +++ b/connectivity/source/drivers/firebird/User.hxx @@ -29,11 +29,11 @@ namespace connectivity /** * Create a "new" descriptor, which isn't yet in the database. */ - explicit User(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rConnection); + explicit User(const css::uno::Reference< css::sdbc::XConnection >& rConnection); /** * For a user that already exists in the db. */ - User(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rConnection, + User(const css::uno::Reference< css::sdbc::XConnection >& rConnection, const ::rtl::OUString& rName); // IRefreshableGroups:: diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx index a64bcca8920e..975bd1376263 100644 --- a/connectivity/source/drivers/firebird/Users.hxx +++ b/connectivity/source/drivers/firebird/Users.hxx @@ -25,22 +25,22 @@ namespace connectivity class Users: public ::connectivity::sdbcx::OCollection { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // OCollection virtual void impl_refresh() - throw(::com::sun::star::uno::RuntimeException) override; + throw(css::uno::RuntimeException) override; virtual ::connectivity::sdbcx::ObjectType createObject( const ::rtl::OUString& rName) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; virtual ::connectivity::sdbcx::ObjectType appendObject( const OUString& rName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rDescriptor) override; + const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override; public: - Users(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& rMetaData, + Users(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& rMetaData, ::cppu::OWeakObject& rParent, ::osl::Mutex& rMutex, ::connectivity::TStringVector& rNames); diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index c04488f342d7..8e66aebfe0c8 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -47,8 +47,8 @@ namespace connectivity */ void evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector, const ::rtl::OUString& aCause, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext) - throw (::com::sun::star::sdbc::SQLException); + const css::uno::Reference< css::uno::XInterface >& _rxContext) + throw (css::sdbc::SQLException); sal_Int32 getColumnTypeFromFBType(short aType); ::rtl::OUString getColumnTypeNameFromFBType(short aType); diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index 1d1d196a5596..748bdae64f54 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -121,7 +121,7 @@ Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) throw(S return xMetaData; } -::com::sun::star::uno::Reference< XTablesSupplier > OFlatConnection::createCatalog() +css::uno::Reference< XTablesSupplier > OFlatConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XTablesSupplier > xTab = m_xCatalog; diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 66dc93a8af07..6fdc55c73882 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -29,11 +29,11 @@ using namespace connectivity::flat; using namespace connectivity::file; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::lang; +using namespace css::uno; +using namespace css::beans; +using namespace css::sdbcx; +using namespace css::sdbc; +using namespace css::lang; // static ServiceInfo @@ -50,7 +50,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::flat::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 93b853a731d6..4a8c37900198 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -164,7 +164,7 @@ void SAL_CALL OFlatResultSet::release() throw() OFlatResultSet_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx index d7fb9a281d00..6f7acf300106 100644 --- a/connectivity/source/drivers/flat/EStatement.cxx +++ b/connectivity/source/drivers/flat/EStatement.cxx @@ -22,7 +22,7 @@ using namespace connectivity::flat; using namespace connectivity::file; -using namespace com::sun::star::uno; +using namespace css::uno; OResultSet* OFlatStatement::createResultSet() { diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 323e7095de10..2f85d9325bef 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -63,7 +63,7 @@ using std::vector; using std::lower_bound; -void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) +void OFlatTable::fillColumns(const css::lang::Locale& _aLocale) { m_bNeedToReadLine = true; // we overwrite m_aCurrentLine, seek the stream, ... m_pFileStream->Seek(0); @@ -288,7 +288,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, { try { - nIndex = m_xNumberFormatter->detectNumberFormat(::com::sun::star::util::NumberFormat::ALL,aField2); + nIndex = m_xNumberFormatter->detectNumberFormat(css::util::NumberFormat::ALL,aField2); } catch(Exception&) { @@ -315,7 +315,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, { try { - nIndex = m_xNumberFormatter->detectNumberFormat(::com::sun::star::util::NumberFormat::ALL,aField2); + nIndex = m_xNumberFormatter->detectNumberFormat(css::util::NumberFormat::ALL,aField2); } catch(Exception&) { @@ -412,7 +412,7 @@ OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnectio void OFlatTable::construct() { SvtSysLocale aLocale; - ::com::sun::star::lang::Locale aAppLocale(aLocale.GetLanguageTag().getLocale()); + css::lang::Locale aAppLocale(aLocale.GetLanguageTag().getLocale()); Reference< XNumberFormatsSupplier > xSupplier = NumberFormatsSupplier::createWithLocale( m_pConnection->getDriver()->getComponentContext(), aAppLocale ); m_xNumberFormatter.set( NumberFormatter::create( m_pConnection->getDriver()->getComponentContext()), UNO_QUERY_THROW); @@ -549,7 +549,7 @@ Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeExcep return Any(); Any aRet = OTable_TYPEDEF::queryInterface(rType); - return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< ::com::sun::star::lang::XUnoTunnel*> (this)); + return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< css::lang::XUnoTunnel*> (this)); } @@ -568,7 +568,7 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { @@ -627,7 +627,7 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool { try { - double nRes = m_xNumberFormatter->convertStringToNumber(::com::sun::star::util::NumberFormat::ALL,aStr); + double nRes = m_xNumberFormatter->convertStringToNumber(css::util::NumberFormat::ALL,aStr); switch(nType) { diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 8ecbc3269147..1a0ef32a0551 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -61,21 +61,21 @@ namespace connectivity { using namespace hsqldb; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::sdbc; - using namespace ::com::sun::star::sdbcx; - using namespace ::com::sun::star::beans; - using namespace ::com::sun::star::frame; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::embed; - using namespace ::com::sun::star::io; - using namespace ::com::sun::star::task; - using namespace ::com::sun::star::util; - using namespace ::com::sun::star::reflection; + using namespace css::uno; + using namespace css::sdbc; + using namespace css::sdbcx; + using namespace css::beans; + using namespace css::frame; + using namespace css::lang; + using namespace css::embed; + using namespace css::io; + using namespace css::task; + using namespace css::util; + using namespace css::reflection; namespace hsqldb { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) + Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) { return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac))); } @@ -518,7 +518,7 @@ namespace connectivity return getSupportedServiceNames_Static(); } - void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, ::com::sun::star::container::ElementExistException, RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, css::container::ElementExistException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XCreateCatalog::createCatalog", *this ); } @@ -558,7 +558,7 @@ namespace connectivity m_aConnections.erase(_aIter); } - void SAL_CALL ODriverDelegator::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); Reference<XConnection> xCon(Source.Source,UNO_QUERY); @@ -628,7 +628,7 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -671,15 +671,15 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) { } - void SAL_CALL ODriverDelegator::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { } - void SAL_CALL ODriverDelegator::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) { } @@ -828,7 +828,7 @@ namespace connectivity { Reference< XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( _rxContext ) ); + css::configuration::theDefaultProvider::get( _rxContext ) ); // arguments for creating the config access diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 757f7b9d2cca..4f479a159ceb 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -141,7 +141,7 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index 0aa6ebae815c..95dc90980523 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx @@ -30,8 +30,7 @@ namespace connectivity namespace hsqldb { class ODriverDelegator; - class OConnectionController : public ::cppu::WeakImplHelper< - ::com::sun::star::frame::XTerminateListener > + class OConnectionController : public ::cppu::WeakImplHelper< css::frame::XTerminateListener > { ODriverDelegator* m_pDriver; protected: @@ -40,14 +39,14 @@ namespace connectivity explicit OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){} // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) + throw( css::uno::RuntimeException, std::exception ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) + throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) + throw( css::uno::RuntimeException, std::exception ) override; }; } diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index 59a3b8777447..fe87987fd73e 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -36,13 +36,13 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true) +OHSQLUser::OHSQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true) ,m_xConnection(_xConnection) { construct(); } -OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, +OHSQLUser::OHSQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const OUString& Name ) : connectivity::sdbcx::OUser(Name, true) ,m_xConnection(_xConnection) @@ -54,7 +54,7 @@ void OHSQLUser::refreshGroups() { } -OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection) +OUserExtend::OUserExtend( const css::uno::Reference< css::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection) { construct(); } diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 0894a4b06fa7..771645269f9c 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; OUsers::OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, connectivity::sdbcx::IRefreshableUsers* _pParent) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xConnection(_xConnection) diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index 53c7b20da23b..dc0dd69de886 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -40,12 +40,12 @@ using namespace ::comphelper; using namespace ::cppu; using namespace connectivity; using namespace connectivity::hsqldb; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; +using namespace css::uno; +using namespace css::beans; +using namespace css::sdbcx; +using namespace css::sdbc; +using namespace css::container; +using namespace css::lang; using namespace dbtools; typedef connectivity::sdbcx::OCollection OCollection_TYPE; diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 82545c75d47e..54003dba9330 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -22,10 +22,10 @@ #include <cppuhelper/factory.hxx> using namespace connectivity::hsqldb; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::lang::XSingleServiceFactory; -using ::com::sun::star::lang::XMultiServiceFactory; +using css::uno::Reference; +using css::uno::Sequence; +using css::lang::XSingleServiceFactory; +using css::lang::XMultiServiceFactory; typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) ( diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index c8d422931aa0..f05f664b14dc 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -40,19 +40,19 @@ jclass java_sql_Array::getMyClass() const return theClass; } -OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); return callStringMethod("getBaseTypeName",mID); } -sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); return callIntMethod_ThrowSQL("getBaseType", mID); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_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 > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -67,10 +67,10 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: // and clean up t.pEnv->DeleteLocalRef(obj); } //t.pEnv - return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >(); + return css::uno::Sequence< css::uno::Any >(); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_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) +css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -85,10 +85,10 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: // and clean up t.pEnv->DeleteLocalRef(obj); } - return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >(); + return css::uno::Sequence< css::uno::Any >(); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_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 > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -108,7 +108,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: return nullptr; } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_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) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index e264e4612274..7c972bc89aa6 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -48,7 +48,7 @@ jclass java_sql_Blob::getMyClass() const return theClass; } -sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -65,11 +65,11 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx } //t.pEnv return (sal_Int64)out; } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; { // initialize temporary variable static const char * cSignature = "(JI)[B"; @@ -91,7 +91,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx return aSeq; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -100,7 +100,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Blob::position( const ::com::sun::star::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -130,7 +130,7 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const ::com::sun::star::uno::Sequenc return (sal_Int64)out; } -sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this ); // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index dfa44629389f..9a1aa1f5ce6c 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -60,7 +60,7 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< css::sdbc::XRow*>(this),static_cast< css::sdbc::XOutParameters*>(this)); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( cppu::UnoType<css::sdbc::XRow>::get(), cppu::UnoType<css::sdbc::XOutParameters>::get()); @@ -110,13 +110,13 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co } return aSeq; } -::com::sun::star::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); - return out ? static_cast <com::sun::star::util::Date>(java_sql_Date( t.pEnv, out )) : ::com::sun::star::util::Date(); + return out ? static_cast <css::util::Date>(java_sql_Date( t.pEnv, out )) : css::util::Date(); } double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { @@ -153,7 +153,7 @@ sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) return callMethodWithIntArg<jlong>(pCallMethod,"getLong","(I)J",mID,columnIndex); } -Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -182,24 +182,24 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return callStringMethodWithIntArg("getString",mID,columnIndex); } - ::com::sun::star::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) + css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer - return out ? static_cast <com::sun::star::util::Time> (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time(); + return out ? static_cast <css::util::Time> (java_sql_Time( t.pEnv, out )) : css::util::Time(); } - ::com::sun::star::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) + css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer - return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime(); + return out ? static_cast <css::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : css::util::DateTime(); } void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, RuntimeException, std::exception) @@ -223,7 +223,7 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } -void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -252,15 +252,15 @@ jclass java_sql_CallableStatement::getMyClass() const return theClass; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { Reference< css::sdbc::XBlob > xBlob = getBlob(columnIndex); - return xBlob.is() ? xBlob->getBinaryStream() : Reference< ::com::sun::star::io::XInputStream >(); + return xBlob.is() ? xBlob->getBinaryStream() : Reference< css::io::XInputStream >(); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { Reference< css::sdbc::XClob > xClob = getClob(columnIndex); - return xClob.is() ? xClob->getCharacterStream() : Reference< ::com::sun::star::io::XInputStream >(); + return xClob.is() ? xClob->getCharacterStream() : Reference< css::io::XInputStream >(); } Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index afa79124ce2b..9bbbed12c6e3 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -47,7 +47,7 @@ jclass java_sql_Clob::getMyClass() const return theClass; } -sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -65,7 +65,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx return (sal_Int64)out; } -OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); OUString aStr; @@ -84,7 +84,7 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin return aStr; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; static jmethodID mID(nullptr); @@ -94,7 +94,7 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin return out==nullptr ? nullptr : new java_io_Reader( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -116,7 +116,7 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 return (sal_Int64)out; } -sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const css::uno::Reference< css::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XClob::positionOfClob", *this ); // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 130f878783b4..d64870eb71f4 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -54,33 +54,33 @@ jclass java_io_InputStream::getMyClass() const } -sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callIntMethodWithIntArg_ThrowRuntime("skip",mID,nBytesToSkip); } -sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("available", mID); } -void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_io_InputStream::closeInput( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("close",mID); } -sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { if (nBytesToRead < 0) - throw ::com::sun::star::io::BufferSizeExceededException( THROW_WHERE, *this ); + throw css::io::BufferSizeExceededException( THROW_WHERE, *this ); jint out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index 10d97a6bea13..0e8e06e0b868 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -410,7 +410,7 @@ void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQ callVoidMethodWithBoolArg_ThrowSQL("setAutoCommit", mID, autoCommit); } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -422,7 +422,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connecti return nullptr; } -void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 8c6db0423355..5d69146d4a43 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -java_sql_Driver::java_sql_Driver(const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) +java_sql_Driver::java_sql_Driver(const Reference< css::uno::XComponentContext >& _rxContext) :m_aContext( _rxContext ) ,m_aLogger( _rxContext, "sdbcl", "org.openoffice.sdbc.jdbcBridge" ) { @@ -65,7 +65,7 @@ Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw return aSNS; } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) { return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory))); } diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index a04f4d29613c..004d61d086d6 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -128,9 +128,9 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeException, std::exception) { - ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); Sequence< Type > aOldTypes = java_sql_Statement_BASE::getTypes(); if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() ) @@ -194,7 +194,7 @@ void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::e } -void SAL_CALL java_sql_Statement_Base::close( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::close( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -205,7 +205,7 @@ void SAL_CALL java_sql_Statement_Base::close( ) throw(::com::sun::star::sdbc::S } -void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement::clearBatch( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -301,7 +301,7 @@ Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(Runt } -void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -314,7 +314,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::s } -Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -348,7 +348,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) } -Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -360,7 +360,7 @@ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base } -sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -371,14 +371,14 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(::com::sun: } -sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { static jmethodID mID(nullptr); return callBooleanMethod( "getMoreResults", mID ); } -Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; createStatement(t.pEnv); @@ -396,7 +396,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd return Any(); } -void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -589,25 +589,25 @@ void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLExce Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), PROPERTY_ID_USEBOOKMARKS, cppu::UnoType<bool>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -625,7 +625,7 @@ sal_Bool java_sql_Statement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { try { @@ -655,11 +655,11 @@ sal_Bool java_sql_Statement_Base::convertFastPropertyValue( ; } } - catch(const ::com::sun::star::lang::IllegalArgumentException&) + catch(const css::lang::IllegalArgumentException&) { throw; } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -826,7 +826,7 @@ void SAL_CALL java_sql_Statement::release() throw() OStatement_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index ee79b4153b23..e7666cc39a31 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -203,7 +203,7 @@ void java_lang_Object::ThrowLoggedSQLException( const ::comphelper::ResourceBase SQLException aException; if ( lcl_translateJNIExceptionToUNOException( _pEnvironment, _rxContext, aException ) ) { - _rLogger.log( ::com::sun::star::logging::LogLevel::SEVERE, STR_LOG_THROWING_EXCEPTION, aException.Message, aException.SQLState, aException.ErrorCode ); + _rLogger.log( css::logging::LogLevel::SEVERE, STR_LOG_THROWING_EXCEPTION, aException.Message, aException.SQLState, aException.ErrorCode ); throw aException; } } diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index df0ee8a5fc9e..98e13883ce45 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -71,9 +71,9 @@ jclass java_sql_PreparedStatement::getMyClass() const } -::com::sun::star::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = OStatement_BASE2::queryInterface(rType); + css::uno::Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, static_cast< XPreparedStatement*>(this), static_cast< XParameters*>(this), @@ -81,7 +81,7 @@ jclass java_sql_PreparedStatement::getMyClass() const static_cast< XPreparedBatchExecution*>(this)); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(), cppu::UnoType<XParameters>::get(), @@ -92,7 +92,7 @@ jclass java_sql_PreparedStatement::getMyClass() const } -sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -105,7 +105,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(::com::sun::star } -sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::su } -void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -140,13 +140,13 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return Reference< XConnection >(m_pConnection); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_QUERY ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -161,7 +161,7 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c } -void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex, bool(x) ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -174,7 +174,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, } -void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTE_PARAMETER, parameterIndex, (sal_Int32)x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -187,7 +187,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_DATE_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +201,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con } -void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIME_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -215,7 +215,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con } -void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIMESTAMP_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +228,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex callVoidMethod_ThrowSQL("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject()); } -void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_DOUBLE_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -241,7 +241,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d } -void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_FLOAT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -254,7 +254,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl } -void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_INT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_ } -void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_LONG_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -280,7 +280,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_NULL_PARAMETER, parameterIndex, sqlType ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -293,31 +293,31 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XClob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL java_sql_PreparedStatement::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) +void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XBlob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL java_sql_PreparedStatement::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) +void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XArray >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL java_sql_PreparedStatement::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) +void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XRef >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -377,7 +377,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter } -void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -390,7 +390,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde } -void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -403,7 +403,7 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c } -void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_SHORT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -416,7 +416,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa } -void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTES_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -449,7 +449,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co } -void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const ::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) +void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_CHARSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -508,7 +508,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete } -void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const ::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) +void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BINARYSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -567,7 +567,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn } -void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_CLEAR_PARAMETERS ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -582,7 +582,7 @@ void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(::com::sun:: } //t.pEnv } -void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -595,7 +595,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(::com::sun::star: } -void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -608,11 +608,11 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd } -::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - ::com::sun::star::uno::Sequence< sal_Int32 > aSeq; + css::uno::Sequence< sal_Int32 > aSeq; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(nullptr); @@ -627,7 +627,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd return aSeq; } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 4e96bfad3baa..2f391505fb87 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -45,12 +45,12 @@ jclass java_io_Reader::getMyClass() const return theClass; } -sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); if(nBytesToSkip <= 0) @@ -74,7 +74,7 @@ void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::s } } -sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) { if(m_buf != boost::none) return 1; @@ -93,13 +93,13 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::Not return (m_buf != boost::none ? 1 : 0) + (out ? 1 : 0); // no way to tell *how much* is ready } -void SAL_CALL java_io_Reader::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_io_Reader::closeInput( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("close", mID); } -sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { OSL_ENSURE(aData.getLength() >= nBytesToRead," Sequence is smaller than BytesToRead"); diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index d2ef7854ceed..84cf5f765457 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.cxx @@ -43,7 +43,7 @@ jclass java_sql_Ref::getMyClass() const return theClass; } -OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 3cef4b7b270e..e8133d31a2ca 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -113,29 +113,29 @@ m_xMetaData.clear(); SDBThreadAttach::releaseRef(); } -::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aRet = OPropertySetHelper::queryInterface(rType); + css::uno::Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : java_sql_ResultSet_BASE::queryInterface(rType); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(css::uno::RuntimeException, std::exception) { - ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_ResultSet_BASE::getTypes()); } -sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); return callIntMethodWithStringArg("findColumn",mID,columnName); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -145,7 +145,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out ); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -188,13 +188,13 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde } -::com::sun::star::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer - return out ? static_cast <com::sun::star::util::Date> (java_sql_Date( t.pEnv, out )) : ::com::sun::star::util::Date(); + return out ? static_cast <css::util::Date> (java_sql_Date( t.pEnv, out )) : css::util::Date(); } @@ -236,7 +236,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -286,7 +286,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t } -Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { jobject out(nullptr); Any aRet; @@ -327,17 +327,17 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen else if ( t.pEnv->IsInstanceOf(out,java_sql_Date::st_getMyClass()) ) { java_sql_Date aVal(t.pEnv,out); - aRet <<= ::com::sun::star::util::Date(aVal); + aRet <<= css::util::Date(aVal); } else if ( t.pEnv->IsInstanceOf(out,java_sql_Time::st_getMyClass()) ) { java_sql_Time aVal(t.pEnv,out); - aRet <<= ::com::sun::star::util::Time(aVal); + aRet <<= css::util::Time(aVal); } else if ( t.pEnv->IsInstanceOf(out,java_sql_Timestamp::st_getMyClass()) ) { java_sql_Timestamp aVal(t.pEnv,out); - aRet <<= ::com::sun::star::util::DateTime(aVal); + aRet <<= css::util::DateTime(aVal); } else t.pEnv->DeleteLocalRef(out); @@ -362,23 +362,23 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S } -::com::sun::star::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer - return out ? static_cast <com::sun::star::util::Time> (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time(); + return out ? static_cast <css::util::Time> (java_sql_Time( t.pEnv, out )) : css::util::Time(); } -::com::sun::star::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer - return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime(); + return out ? static_cast <css::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : css::util::DateTime(); } @@ -413,7 +413,7 @@ void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeExcep } -void SAL_CALL java_sql_ResultSet::close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { dispose(); } @@ -494,19 +494,19 @@ sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeExc return callBooleanMethod( "wasNull", mID ); } -void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::cancel( ) throw(css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("cancel", mID); } -void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("clearWarnings", mID); } -::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; static jmethodID mID(nullptr); @@ -520,104 +520,104 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc java_sql_SQLWarning(warn_base,*this))); } - return ::com::sun::star::uno::Any(); + return css::uno::Any(); } -void SAL_CALL java_sql_ResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("insertRow", mID); } -void SAL_CALL java_sql_ResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateRow", mID); } -void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("deleteRow", mID); } -void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("cancelRowUpdates", mID); } -void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("moveToInsertRow", mID); } -void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("moveToCurrentRow", mID); } -void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowSQL("updateNull", mID, columnIndex); } -void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateBoolean", "(IZ)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateByte", "(IB)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateShort", "(IS)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateInt", "(II)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateLong", "(IJ)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateFloat", "(IF)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateDouble", "(ID)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; @@ -643,7 +643,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS } -void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SDBThreadAttach t; @@ -679,7 +679,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co } -void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { java_sql_Date aD(x); static jmethodID mID(nullptr); @@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com } -void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { java_sql_Time aD(x); static jmethodID mID(nullptr); @@ -695,7 +695,7 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com } -void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { java_sql_Timestamp aD(x); static jmethodID mID(nullptr); @@ -703,7 +703,7 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const } -void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const ::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) +void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { try { @@ -734,7 +734,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con } } -void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const ::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) +void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { try { @@ -765,7 +765,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, } } -void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { if(!::dbtools::implUpdateObject(this,columnIndex,x)) { @@ -779,7 +779,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c } -void SAL_CALL java_sql_ResultSet::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) +void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { // OSL_FAIL("java_sql_ResultSet::updateNumericObject: NYI"); try @@ -821,38 +821,38 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co } } -sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException) { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getConcurrency", mID); } -sal_Int32 java_sql_ResultSet::getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getResultSetType() const throw(css::sdbc::SQLException, css::uno::RuntimeException) { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getType",mID); } -sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(css::sdbc::SQLException, css::uno::RuntimeException) { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getFetchDirection", mID); } -sal_Int32 java_sql_ResultSet::getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getFetchSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException) { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getFetchSize", mID); } -OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString java_sql_ResultSet::getCursorName() const throw(css::sdbc::SQLException, css::uno::RuntimeException) { static jmethodID mID(nullptr); return callStringMethod("getCursorName",mID); } -void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0); @@ -864,7 +864,7 @@ void SAL_CALL java_sql_ResultSet::refreshRow( ) throw(SQLException, RuntimeExce callVoidMethod_ThrowSQL("refreshRow",mID); } -void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0); @@ -875,19 +875,19 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); return new ::cppu::OPropertyArrayHelper(aProps); @@ -899,11 +899,11 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s } sal_Bool java_sql_ResultSet::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, ::com::sun::star::uno::RuntimeException) + const css::uno::Any& rValue ) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { bool bRet = false; switch(nHandle) @@ -911,7 +911,7 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue( case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_FETCHDIRECTION: bRet = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); break; @@ -927,16 +927,16 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue( void java_sql_ResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue + const css::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) + throw (css::uno::Exception, std::exception) { switch(nHandle) { case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::uno::Exception(); + throw css::uno::Exception(); case PROPERTY_ID_FETCHDIRECTION: setFetchDirection(comphelper::getINT32(rValue)); break; @@ -949,7 +949,7 @@ void java_sql_ResultSet::setFastPropertyValue_NoBroadcast( } void java_sql_ResultSet::getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const { @@ -989,7 +989,7 @@ void SAL_CALL java_sql_ResultSet::release() throw() java_sql_ResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index c465d5df981c..c016717a7b32 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -158,7 +158,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) return callIntMethodWithIntArg_ThrowSQL("getPrecision",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getScale",mID,column); diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 89cf8972d017..e6a99e0fbc24 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -29,7 +29,7 @@ using namespace connectivity; jclass java_sql_Date::theClass = nullptr; -java_sql_Date::java_sql_Date( const ::com::sun::star::util::Date& _rOut ) : java_util_Date( nullptr, nullptr ) +java_sql_Date::java_sql_Date( const css::util::Date& _rOut ) : java_util_Date( nullptr, nullptr ) { SDBThreadAttach t; if( !t.pEnv ) @@ -72,7 +72,7 @@ jclass java_sql_Date::st_getMyClass() } -java_sql_Date::operator ::com::sun::star::util::Date() +java_sql_Date::operator css::util::Date() { return ::dbtools::DBTypeConversion::toDate(toString()); } @@ -97,7 +97,7 @@ jclass java_sql_Time::st_getMyClass() theClass = findMyClass("java/sql/Time"); return theClass; } -java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_util_Date( nullptr, nullptr ) +java_sql_Time::java_sql_Time( const css::util::Time& _rOut ): java_util_Date( nullptr, nullptr ) { SDBThreadAttach t; if( !t.pEnv ) @@ -126,7 +126,7 @@ java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_ // and clean } -java_sql_Time::operator ::com::sun::star::util::Time() +java_sql_Time::operator css::util::Time() { return ::dbtools::DBTypeConversion::toTime(toString()); } @@ -152,7 +152,7 @@ jclass java_sql_Timestamp::st_getMyClass() return theClass; } -java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& _rOut) +java_sql_Timestamp::java_sql_Timestamp(const css::util::DateTime& _rOut) :java_util_Date( nullptr, nullptr ) { SDBThreadAttach t; @@ -183,7 +183,7 @@ java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& _ } -java_sql_Timestamp::operator ::com::sun::star::util::DateTime() +java_sql_Timestamp::operator css::util::DateTime() { return ::dbtools::DBTypeConversion::toDateTime(toString()); } diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index f07197b9fec3..78e27dd5696e 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -173,11 +173,11 @@ OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring Str) return aStr; } -jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference< ::com::sun::star::container::XNameAccess > & _rMap) +jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference< css::container::XNameAccess > & _rMap) { if ( _rMap.is() ) { - ::com::sun::star::uno::Sequence< OUString > aNames = _rMap->getElementNames(); + css::uno::Sequence< OUString > aNames = _rMap->getElementNames(); if ( aNames.getLength() > 0 ) ::dbtools::throwFeatureNotImplementedSQLException( "Type maps", nullptr ); } @@ -201,7 +201,7 @@ bool connectivity::isExceptionOccurred(JNIEnv *pEnv,bool _bClear) return bRet; } -jobject connectivity::createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length) +jobject connectivity::createByteInputStream(const css::uno::Reference< css::io::XInputStream >& x,sal_Int32 length) { SDBThreadAttach t; if( !t.pEnv || !x.is() ) @@ -228,7 +228,7 @@ jobject connectivity::createByteInputStream(const ::com::sun::star::uno::Referen return out; } -jobject connectivity::createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length) +jobject connectivity::createCharArrayReader(const css::uno::Reference< css::io::XInputStream >& x,sal_Int32 length) { SDBThreadAttach t; if( !t.pEnv || !x.is() ) diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index feea5e715873..e524b571eae1 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -31,7 +31,7 @@ namespace connectivity class KabCatalog : public connectivity::sdbcx::OCatalog { KabConnection* m_pConnection; // used to get the metadata - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: explicit KabCatalog(KabConnection* _pCon); @@ -45,8 +45,8 @@ namespace connectivity virtual void refreshUsers() override; // 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; }; } } diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx index 03d8c882982d..80145a8bd5f3 100644 --- a/connectivity/source/drivers/kab/KColumns.hxx +++ b/connectivity/source/drivers/kab/KColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity KabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: KabColumns( KabTable* _pTable, diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index 1938336ca5df..b3e262eff771 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -224,7 +224,7 @@ sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) throw(SQLException return TransactionIsolation::NONE; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -234,7 +234,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL KabConnection::ge return NULL; } -void SAL_CALL KabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException, std::exception) { // the other way around } @@ -280,7 +280,7 @@ void KabConnection::disposing() m_pAddressBook = NULL; } - m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); + m_xMetaData = css::uno::WeakReference< css::sdbc::XDatabaseMetaData>(); dispose_ChildImpl(); KabConnection_BASE::disposing(); diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index 89858f523c4b..52fb2c6cfa14 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -46,13 +46,13 @@ namespace connectivity namespace kab { - typedef ::cppu::WeakComponentImplHelper<::com::sun::star::sdbc::XConnection, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper<css::sdbc::XConnection, + css::sdbc::XWarningsSupplier, + css::lang::XServiceInfo > OMetaConnection_BASE; typedef OMetaConnection_BASE KabConnection_BASE; // implements basics and text encoding - typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; + typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; class KabConnection : public comphelper::OBaseMutex, public KabConnection_BASE, @@ -64,14 +64,14 @@ namespace connectivity // Data attributes - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::WeakReference< css::sdbc::XDatabaseMetaData > m_xMetaData; OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects // for this Connection ::KABC::StdAddressBook* m_pAddressBook; // the address book css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> + css::uno::Reference< css::sdbcx::XTablesSupplier> m_xCatalog; // needed for the SQL interpreter public: @@ -83,7 +83,7 @@ namespace connectivity css::uno::Reference<css::sdbc::XDriver> const & driver); virtual ~KabConnection(); - void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); + void closeAllStatements () throw( css::sdbc::SQLException); // OComponentHelper virtual void SAL_CALL disposing() override; @@ -95,34 +95,34 @@ namespace connectivity DECLARE_SERVICE_INFO(); // 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( 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( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) 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 void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - 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; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // needed for the SQL interpreter - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); + css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); css::uno::Reference<css::uno::XComponentContext> getComponentContext() const diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index a94eb3838943..3c7c927b7869 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -32,12 +32,12 @@ namespace connectivity //************ Class: KabDatabaseMetaData - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> KabDatabaseMetaData_BASE; + typedef ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData> KabDatabaseMetaData_BASE; class KabDatabaseMetaData : public KabDatabaseMetaData_BASE { - ::com::sun::star::uno::Reference< KabConnection > m_xConnection; - bool m_bUseCatalog; + css::uno::Reference< KabConnection > m_xConnection; + bool m_bUseCatalog; public: @@ -47,155 +47,155 @@ namespace connectivity // this interface is really BIG // XDatabaseMetaData - 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/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index 0e50f150d6db..7698d3dcd6ac 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -272,7 +272,7 @@ bool KabImplModule::impl_doAllowNewKDEVersion() try { Reference< XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( m_xContext ) ); + css::configuration::theDefaultProvider::get( m_xContext ) ); Sequence< Any > aCreationArgs(1); aCreationArgs[0] <<= PropertyValue( OUString( "nodepath" ), @@ -322,7 +322,7 @@ void KabImplModule::shutdown() // = KabDriver KabDriver::KabDriver( - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) + const Reference< css::uno::XComponentContext >& _rxContext) : KDriver_BASE(m_aMutex), m_xContext(_rxContext), m_aImplModule(_rxContext) diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index dd5ca1832e55..24e411a3019a 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -42,7 +42,7 @@ namespace connectivity typedef int (SAL_CALL * KDEVersionCheckFunction)( void ); } - typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; + typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; // = KabImplModule @@ -50,7 +50,7 @@ namespace connectivity class KabImplModule { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; /// Did we already attempt to load the module and to retrieve the symbols? @@ -65,7 +65,7 @@ namespace connectivity KDEVersionCheckFunction m_pKDEVersionCheckFunc; public: - explicit KabImplModule( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); + explicit KabImplModule( const css::uno::Reference< css::uno::XComponentContext >& _rxContext ); /** determines whether there is a KDE present in the environment */ @@ -85,9 +85,9 @@ namespace connectivity /** initializes the implementation module. - @raises ::com::sun::star::uno::RuntimeException + @raises css::uno::RuntimeException if the module could be loaded, but required symbols are missing - @raises ::com::sun::star::sdbc::SQLException + @raises css::sdbc::SQLException if the KDE version we're running against is not supported, or no KDE was found at all */ void init(); @@ -99,7 +99,7 @@ namespace connectivity /** creates a new connection @precond <member>init</member> has been called before - @raises ::com::sun::star::uno::RuntimeException + @raises css::uno::RuntimeException if no connection object could be created (which is a severe error, normally impossible) */ css::uno::Reference<css::sdbc::XConnection> createConnection( @@ -112,7 +112,7 @@ namespace connectivity @return <TRUE/> if the module could be loaded successfully. - @raises ::com::sun::star::uno::RuntimeException + @raises css::uno::RuntimeException if the module could be loaded, but required symbols are missing */ bool impl_loadModule(); @@ -130,54 +130,54 @@ namespace connectivity // = KabDriver - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::frame::XTerminateListener > KDriver_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, + css::lang::XServiceInfo, + css::frame::XTerminateListener > KDriver_BASE; class KabDriver : public KDriver_BASE { protected: ::osl::Mutex m_aMutex; // mutex is need to control member access OWeakRefArray m_xConnections; // vector containing a list of all the // KabConnection objects for this Driver - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; // the multi-service factory KabImplModule m_aImplModule; public: - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); // XServiceInfo - static versions - static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); /** returns the path of our configuration settings */ static OUString impl_getConfigurationSettingsPath(); protected: - explicit KabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + explicit KabDriver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); // OComponentHelper virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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 css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException, std::exception) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: /** shuts down the library which contains the real implementations diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index 1d9853dfa5b6..d37b88b4b91f 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -258,12 +258,12 @@ void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) thr ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", NULL); } -void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", NULL); } -void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", NULL); } diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index d4d5b1c101dd..926ab79b2535 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -32,31 +32,31 @@ namespace connectivity namespace kab { typedef ::cppu::ImplInheritanceHelper< KabCommonStatement, - ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::lang::XServiceInfo> KabPreparedStatement_BASE; + css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XResultSetMetaDataSupplier, + css::lang::XServiceInfo> KabPreparedStatement_BASE; class KabPreparedStatement : public KabPreparedStatement_BASE { protected: - OUString m_sSqlStatement; + OUString m_sSqlStatement; ::rtl::Reference< KabResultSetMetaData > - m_xMetaData; + m_xMetaData; bool m_bPrepared; - mutable sal_Int32 m_nParameterIndex; - OValueRow m_aParameterRow; + mutable sal_Int32 m_nParameterIndex; + OValueRow m_aParameterRow; - void checkAndResizeParameters(sal_Int32 nParams) throw(::com::sun::star::sdbc::SQLException); - void setKabFields() const throw(::com::sun::star::sdbc::SQLException); + void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException); + void setKabFields() const throw(css::sdbc::SQLException); protected: 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; - virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException) override; - virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException) override; + virtual void resetParameters() const throw(css::sdbc::SQLException) override; + virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override; virtual ~KabPreparedStatement(); public: @@ -67,44 +67,44 @@ namespace connectivity virtual void SAL_CALL disposing() override; // 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 sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; using KabCommonStatement::executeQuery; using KabCommonStatement::executeUpdate; using KabCommonStatement::execute; // 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; - 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; - 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; - 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; - 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; - 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; - 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; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - 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; - 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; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - 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; - 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; - 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; - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; }; } } diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index fface0363b9c..3c49289a76a0 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -137,14 +137,14 @@ void SAL_CALL KabResultSet::release() throw() Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std::exception) { OTypeCollection aTypes( - cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes()); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -372,7 +372,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) t return NULL; } -Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< ::com::sun::star::container::XNameAccess >&) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -890,22 +890,22 @@ IPropertyArrayHelper* KabResultSet::createArrayHelper() const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); @@ -921,7 +921,7 @@ sal_Bool KabResultSet::convertFastPropertyValue( Any &, sal_Int32 nHandle, const Any& ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { switch (nHandle) { @@ -929,7 +929,7 @@ sal_Bool KabResultSet::convertFastPropertyValue( case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); break; case PROPERTY_ID_FETCHDIRECTION: case PROPERTY_ID_FETCHSIZE: diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index 400b107d8904..51a3278dbf0c 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -39,18 +39,18 @@ namespace connectivity /* ** KabResultSet */ - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> KabResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet, + css::sdbc::XRow, + css::sdbc::XResultSetMetaDataSupplier, + css::util::XCancellable, + css::sdbc::XWarningsSupplier, + css::sdbc::XResultSetUpdate, + css::sdbc::XRowUpdate, + css::sdbcx::XRowLocate, + css::sdbcx::XDeleteRows, + css::sdbc::XCloseable, + css::sdbc::XColumnLocate, + css::lang::XServiceInfo> KabResultSet_BASE; class KabResultSet : public comphelper::OBaseMutex, public KabResultSet_BASE, @@ -62,7 +62,7 @@ namespace connectivity ::rtl::Reference< KabResultSetMetaData > m_xMetaData; // the description of the columns in this result set ::KABC::Addressee::List m_aKabAddressees; // address book entries matching the query sal_Int32 m_nRowPos; // the current row within the result set - bool m_bWasNull; // last entry retrieved from this result set was NULL + bool m_bWasNull; // last entry retrieved from this result set was NULL // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -71,17 +71,17 @@ namespace connectivity 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; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle) const override; using OPropertySetHelper::getFastPropertyValue; @@ -93,9 +93,9 @@ namespace connectivity explicit KabResultSet(KabCommonStatement *pStmt); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() + css::uno::Reference< css::uno::XInterface > operator *() { - return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast<KabResultSet_BASE*>(this)); + return css::uno::Reference< css::uno::XInterface >(*static_cast<KabResultSet_BASE*>(this)); } void allKabAddressees(); @@ -109,110 +109,110 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // 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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XResultSet - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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( 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; + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // 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; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& firstItem, const ::com::sun::star::uno::Any& secondItem ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index a1d1a82f4725..9d4cf0060e91 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx @@ -141,7 +141,7 @@ sal_Int32 SAL_CALL KabResultSetMetaData::getPrecision(sal_Int32) throw(SQLExcept return 0; } -sal_Int32 SAL_CALL KabResultSetMetaData::getScale(sal_Int32) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSetMetaData::getScale(sal_Int32) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return 0; } diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx index 29607280fe87..dd2bcd90e7ad 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx @@ -32,7 +32,7 @@ namespace connectivity /* ** KabResultSetMetaData */ - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> KabResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> KabResultSetMetaData_BASE; class KabResultSetMetaData : public KabResultSetMetaData_BASE { @@ -46,35 +46,35 @@ namespace connectivity KabResultSetMetaData(); // avoid ambigous cast error from the compiler - inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() + inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } void setKabFields( - const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException); + const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aKabFields[columnIndex - 1]; } - 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/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index 1c5f494e083f..c5328708d919 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -81,12 +81,12 @@ void KabCommonStatement::disposing() KabCommonStatement_BASE::disposing(); } -void KabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc::SQLException) +void KabCommonStatement::resetParameters() const throw(css::sdbc::SQLException) { lcl_throwError(STR_PARA_ONLY_PREPARED); } -void KabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException) +void KabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException) { lcl_throwError(STR_PARA_ONLY_PREPARED); } @@ -479,25 +479,25 @@ void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeE Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), PROPERTY_ID_USEBOOKMARKS, cppu::UnoType<bool>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -512,7 +512,7 @@ sal_Bool KabCommonStatement::convertFastPropertyValue( Any &, Any &, sal_Int32, - const Any&) throw (::com::sun::star::lang::IllegalArgumentException) + const Any&) throw (css::lang::IllegalArgumentException) { bool bConverted = false; // here we have to try to convert @@ -568,7 +568,7 @@ void SAL_CALL KabCommonStatement::release() throw() KabCommonStatement_BASE::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index 76c2e320830c..0218d9d7fc55 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -34,10 +34,10 @@ namespace connectivity { namespace kab { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XStatement, + css::sdbc::XWarningsSupplier, + css::util::XCancellable, + css::sdbc::XCloseable> KabCommonStatement_BASE; // Class KabCommonStatement @@ -49,10 +49,10 @@ namespace connectivity public comphelper::OPropertyArrayUsageHelper<KabCommonStatement> { - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + css::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; @@ -60,13 +60,13 @@ namespace connectivity protected: class KabCondition *analyseWhereClause( - const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); + const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); class KabOrder *analyseOrderByClause( - const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); + const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); bool isTableKnown(class KabResultSet *pResult) const; - void setKabFields(class KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); - void selectAddressees(KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); - void sortAddressees(KabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); + void setKabFields(class KabResultSet *pResult) const throw(css::sdbc::SQLException); + void selectAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException); + void sortAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; @@ -74,27 +74,27 @@ namespace connectivity // 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; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle) const override; using OPropertySetHelper::getFastPropertyValue; - virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void resetParameters() const throw(css::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException); virtual ~KabCommonStatement(); public: ::cppu::OBroadcastHelper& rBHelper; explicit KabCommonStatement(KabConnection *_pConnection); - using KabCommonStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + using KabCommonStatement_BASE::operator css::uno::Reference< css::uno::XInterface >; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -102,48 +102,48 @@ namespace connectivity // XInterface virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType - ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType + ) throw(css::uno::RuntimeException, std::exception) override; // 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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( + ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( + ) throw(css::uno::RuntimeException, std::exception) override; // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( + const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL executeUpdate( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + const OUString& sql ) 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; + const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( + ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // XCancellable virtual void SAL_CALL cancel( - ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + ) throw(css::uno::RuntimeException, std::exception) override; // 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; }; // Class KabStatement typedef ::cppu::ImplInheritanceHelper< - KabCommonStatement, ::com::sun::star::lang::XServiceInfo > KabStatement_BASE; + KabCommonStatement, css::lang::XServiceInfo > KabStatement_BASE; class KabStatement : public KabStatement_BASE { diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx index 22e59949ca16..a2b27522c362 100644 --- a/connectivity/source/drivers/kab/KTable.hxx +++ b/connectivity/source/drivers/kab/KTable.hxx @@ -31,7 +31,7 @@ namespace connectivity class KabTable : public KabTable_TYPEDEF { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; KabConnection* m_pConnection; public: diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index 1760aabf1e6c..5a9c9ad2a927 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -29,15 +29,15 @@ namespace connectivity { class KabTables : public sdbcx::OCollection { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: KabTables( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData, + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index 7d9420073ba6..30eb4b9c50ec 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -59,7 +59,7 @@ class KabConditionColumn : public KabCondition public: explicit KabConditionColumn( - const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(css::sdbc::SQLException); virtual bool isAlwaysTrue() const override; virtual bool isAlwaysFalse() const override; }; @@ -68,7 +68,7 @@ class KabConditionNull : public KabConditionColumn { public: explicit KabConditionNull( - const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(css::sdbc::SQLException); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -76,7 +76,7 @@ class KabConditionNotNull : public KabConditionColumn { public: explicit KabConditionNotNull( - const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(css::sdbc::SQLException); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -88,7 +88,7 @@ class KabConditionCompare : public KabConditionColumn public: KabConditionCompare( const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); }; class KabConditionEqual : public KabConditionCompare @@ -96,7 +96,7 @@ class KabConditionEqual : public KabConditionCompare public: KabConditionEqual( const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -105,7 +105,7 @@ class KabConditionDifferent : public KabConditionCompare public: KabConditionDifferent( const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -114,7 +114,7 @@ class KabConditionSimilar : public KabConditionCompare public: KabConditionSimilar( const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index 996c2a109e25..9b3a9273188b 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.hxx @@ -32,7 +32,7 @@ namespace connectivity namespace kab { QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber); - sal_uInt32 findKabField(const OUString& columnName) throw(::com::sun::star::sdbc::SQLException); + sal_uInt32 findKabField(const OUString& columnName) throw(css::sdbc::SQLException); } } diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index 1831832ddc93..36753c0cfd5d 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -31,7 +31,7 @@ namespace connectivity class MacabCatalog : public connectivity::sdbcx::OCatalog { MacabConnection* m_pConnection; // used to get the metadata - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: explicit MacabCatalog(MacabConnection* _pCon); @@ -47,8 +47,8 @@ namespace connectivity virtual void refreshUsers() override; // XTablesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( - ) throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( + ) throw(css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index a304696b3257..d2c7f502e2dc 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity MacabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: MacabColumns( MacabTable* _pTable, diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index 4c25d7559d66..7880fa481a89 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.cxx @@ -223,7 +223,7 @@ sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation( ) throw(SQLExcepti return TransactionIsolation::NONE; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -233,7 +233,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL MacabConnection:: return nullptr; } -void SAL_CALL MacabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException) { // the other way around } @@ -279,7 +279,7 @@ void MacabConnection::disposing() m_pAddressBook = nullptr; } - m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); + m_xMetaData = css::uno::WeakReference< css::sdbc::XDatabaseMetaData>(); dispose_ChildImpl(); MacabConnection_BASE::disposing(); diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 829c216eede1..0ee4d4b50ce4 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -37,21 +37,21 @@ namespace connectivity namespace macab { - typedef ::cppu::WeakComponentImplHelper<::com::sun::star::sdbc::XConnection, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper<css::sdbc::XConnection, + css::sdbc::XWarningsSupplier, + css::lang::XServiceInfo > OMetaConnection_BASE; class MacabDriver; class MacabAddressBook; //typedef OMetaConnection_BASE MacabConnection_BASE; // implements basics and text encoding - typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; + typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; typedef connectivity::OMetaConnection MacabConnection_BASE; class MacabConnection : public MacabConnection_BASE, - public OSubComponent<MacabConnection, MacabConnection_BASE> + public OSubComponent<MacabConnection, MacabConnection_BASE> { friend class OSubComponent<MacabConnection, MacabConnection_BASE>; @@ -59,18 +59,18 @@ namespace connectivity // Data attributes - MacabAddressBook* m_pAddressBook; // the address book - MacabDriver* m_pDriver; // pointer to the owning driver object - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> + MacabAddressBook* m_pAddressBook; // the address book + MacabDriver* m_pDriver; // pointer to the owning driver object + css::uno::Reference< css::sdbcx::XTablesSupplier> m_xCatalog; // needed for the SQL interpreter public: - virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + virtual void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException); explicit MacabConnection(MacabDriver* _pDriver); virtual ~MacabConnection(); - void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); + void closeAllStatements () throw( css::sdbc::SQLException); // OComponentHelper virtual void SAL_CALL disposing() override; @@ -82,34 +82,34 @@ namespace connectivity DECLARE_SERVICE_INFO(); // 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) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // needed for the SQL interpreter - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); + css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); // accessors inline MacabDriver* getDriver() const { return m_pDriver;} diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index f8edbeda8344..297644d37f12 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -32,12 +32,12 @@ namespace connectivity //************ Class: MacabDatabaseMetaData - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> MacabDatabaseMetaData_BASE; + typedef ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData> MacabDatabaseMetaData_BASE; class MacabDatabaseMetaData : public MacabDatabaseMetaData_BASE { - ::com::sun::star::uno::Reference< MacabConnection > m_xConnection; - bool m_bUseCatalog; + css::uno::Reference< MacabConnection > m_xConnection; + bool m_bUseCatalog; public: @@ -48,155 +48,155 @@ namespace connectivity // this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) 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) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index e4fc71d83a1f..8fe1333ea8a7 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -177,7 +177,7 @@ void MacabImplModule::shutdown() // = MacabDriver MacabDriver::MacabDriver( - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) + const Reference< css::uno::XComponentContext >& _rxContext) : MacabDriver_BASE(m_aMutex), m_xContext(_rxContext), m_aImplModule() diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index eeedac4e60a4..8f19c877cfa1 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -42,7 +42,7 @@ namespace connectivity typedef void* (SAL_CALL * ConnectionFactoryFunction)( void* _pDriver ); - typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; + typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; // = MacabImplModule @@ -64,9 +64,9 @@ namespace connectivity /** initializes the implementation module. - @raises ::com::sun::star::uno::RuntimeException + @raises css::uno::RuntimeException if the module could be loaded, but required symbols are missing - @raises ::com::sun::star::sdbc::SQLException + @raises css::sdbc::SQLException if no Mac OS was found at all */ void init(); @@ -78,7 +78,7 @@ namespace connectivity /** creates a new connection @precond <member>init</member> has been called before - @raises ::com::sun::star::uno::RuntimeException + @raises css::uno::RuntimeException if no connection object could be created (which is a severe error, normally impossible) */ MacabConnection* createConnection( MacabDriver* _pDriver ) const; @@ -90,7 +90,7 @@ namespace connectivity @return <TRUE/> if the module could be loaded successfully. - @raises ::com::sun::star::uno::RuntimeException + @raises css::uno::RuntimeException if the module could be loaded, but required symbols are missing */ bool impl_loadModule(); @@ -104,27 +104,27 @@ namespace connectivity // = MacabDriver - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::frame::XTerminateListener > MacabDriver_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, + css::lang::XServiceInfo, + css::frame::XTerminateListener > MacabDriver_BASE; class MacabDriver : public MacabDriver_BASE { protected: ::osl::Mutex m_aMutex; // mutex is need to control member access OWeakRefArray m_xConnections; // vector containing a list of all the // MacabConnection objects for this Driver - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; // the multi-service factory MacabImplModule m_aImplModule; public: - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); // XServiceInfo - static versions - static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & + css::uno::Reference< css::uno::XComponentContext > const & getComponentContext() const { return m_xContext; } /** returns the path of our configuration settings @@ -132,29 +132,29 @@ namespace connectivity static OUString impl_getConfigurationSettingsPath(); protected: - explicit MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); + explicit MacabDriver(const css::uno::Reference< css::uno::XComponentContext >& _rxContext); // OComponentHelper virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException) override; // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override; private: /** shuts down the library which contains the real implementations diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 8f652429e4fb..2b4cbd01271a 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -271,12 +271,12 @@ void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) t ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", nullptr); } -void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", nullptr); } -void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", nullptr); } diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index c6dc744315e0..6e483504e3e8 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx @@ -32,31 +32,31 @@ namespace connectivity namespace macab { typedef ::cppu::ImplInheritanceHelper< MacabCommonStatement, - ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::lang::XServiceInfo> MacabPreparedStatement_BASE; + css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XResultSetMetaDataSupplier, + css::lang::XServiceInfo> MacabPreparedStatement_BASE; class MacabPreparedStatement : public MacabPreparedStatement_BASE { protected: - OUString m_sSqlStatement; + OUString m_sSqlStatement; ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; - bool m_bPrepared; - mutable sal_Int32 m_nParameterIndex; + bool m_bPrepared; + mutable sal_Int32 m_nParameterIndex; OValueRow m_aParameterRow; - void checkAndResizeParameters(sal_Int32 nParams) throw(::com::sun::star::sdbc::SQLException); - void setMacabFields() const throw(::com::sun::star::sdbc::SQLException); + void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException); + void setMacabFields() const throw(css::sdbc::SQLException); protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception) override; + const css::uno::Any& rValue) throw (css::uno::Exception) override; - virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException) override; - virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException) override; + virtual void resetParameters() const throw(css::sdbc::SQLException) override; + virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override; virtual ~MacabPreparedStatement(); public: @@ -71,41 +71,41 @@ namespace connectivity using MacabCommonStatement::executeUpdate; using MacabCommonStatement::execute; - 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) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) 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) 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) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) 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) 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) override; - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // 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) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index a3c2a3b8275e..eaaa60e7fee5 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -35,13 +35,13 @@ using namespace connectivity::macab; using namespace cppu; -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; -using namespace com::sun::star::beans; -using namespace com::sun::star::sdbc; -using namespace com::sun::star::sdbcx; -using namespace com::sun::star::io; -using namespace com::sun::star::util; +using namespace css::uno; +using namespace css::lang; +using namespace css::beans; +using namespace css::sdbc; +using namespace css::sdbcx; +using namespace css::io; +using namespace css::util; IMPLEMENT_SERVICE_INFO(MacabResultSet, "com.sun.star.sdbc.drivers.MacabResultSet", "com.sun.star.sdbc.ResultSet"); @@ -168,14 +168,14 @@ void SAL_CALL MacabResultSet::release() throw() Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException) { OTypeCollection aTypes( - cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return comphelper::concatSequences(aTypes.getTypes(), MacabResultSet_BASE::getTypes()); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -456,7 +456,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) return nullptr; } -Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< ::com::sun::star::container::XNameAccess >&) throw(SQLException, RuntimeException) +Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -984,22 +984,22 @@ IPropertyArrayHelper* MacabResultSet::createArrayHelper() const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); @@ -1015,7 +1015,7 @@ sal_Bool MacabResultSet::convertFastPropertyValue( Any &, sal_Int32 nHandle, const Any& ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { switch (nHandle) { @@ -1023,7 +1023,7 @@ sal_Bool MacabResultSet::convertFastPropertyValue( case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); break; case PROPERTY_ID_FETCHDIRECTION: case PROPERTY_ID_FETCHSIZE: diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 7183cdb71ae5..5e45859ad72d 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -38,18 +38,18 @@ namespace connectivity /* ** MacabResultSet */ - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> MacabResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet, + css::sdbc::XRow, + css::sdbc::XResultSetMetaDataSupplier, + css::util::XCancellable, + css::sdbc::XWarningsSupplier, + css::sdbc::XResultSetUpdate, + css::sdbc::XRowUpdate, + css::sdbcx::XRowLocate, + css::sdbcx::XDeleteRows, + css::sdbc::XCloseable, + css::sdbc::XColumnLocate, + css::lang::XServiceInfo> MacabResultSet_BASE; class MacabRecords; class MacabResultSet : public comphelper::OBaseMutex, @@ -72,17 +72,17 @@ namespace connectivity 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) override; + const css::uno::Any& rValue) + throw (css::uno::Exception) override; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle) const override; // you can't delete objects of this type @@ -93,9 +93,9 @@ namespace connectivity explicit MacabResultSet(MacabCommonStatement *pStmt); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() + css::uno::Reference< css::uno::XInterface > operator *() { - return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast<MacabResultSet_BASE*>(this)); + return css::uno::Reference< css::uno::XInterface >(*static_cast<MacabResultSet_BASE*>(this)); } void allMacabRecords(); @@ -107,110 +107,110 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) override; // XResultSet - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) override; - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) override; - virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) 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) 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) override; + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // 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) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) 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) 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) 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) 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) 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) 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) 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) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& firstItem, const ::com::sun::star::uno::Any& secondItem ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 6dfc2e11cc49..3436e3df0349 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -182,7 +182,7 @@ sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32) throw(SQLExce return 0; } -sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) throw(css::sdbc::SQLException, css::uno::RuntimeException) { return 0; } diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index f4857a46261a..9f40ce3b83dd 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -34,7 +34,7 @@ namespace connectivity /* ** MacabResultSetMetaData */ - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> MacabResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData> MacabResultSetMetaData_BASE; class MacabResultSetMetaData : public MacabResultSetMetaData_BASE { @@ -50,35 +50,35 @@ namespace connectivity MacabResultSetMetaData(MacabConnection* _pConnection, OUString const & _sTableName); // avoid ambigous cast error from the compiler - inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() + inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } void setMacabFields( - const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException); + const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aMacabFields[columnIndex - 1]; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index ec11b22bf801..0746112dfa89 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -84,11 +84,11 @@ void MacabCommonStatement::disposing() MacabCommonStatement_BASE::disposing(); } -void MacabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc::SQLException) +void MacabCommonStatement::resetParameters() const throw(css::sdbc::SQLException) { } -void MacabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException) +void MacabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException) { impl_throwError(STR_PARA_ONLY_PREPARED); } @@ -505,25 +505,25 @@ void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, Runtim Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), PROPERTY_ID_USEBOOKMARKS, cppu::UnoType<bool>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -538,7 +538,7 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue( Any &, Any &, sal_Int32, - const Any&) throw (::com::sun::star::lang::IllegalArgumentException) + const Any&) throw (css::lang::IllegalArgumentException) { bool bConverted = false; // here we have to try to convert @@ -594,7 +594,7 @@ void SAL_CALL MacabCommonStatement::release() throw() MacabCommonStatement_BASE::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo( ) throw(RuntimeException) +Reference< css::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo( ) throw(RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 29f610793add..41937dd1fb7b 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -35,10 +35,10 @@ namespace connectivity { namespace macab { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable> MacabCommonStatement_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XStatement, + css::sdbc::XWarningsSupplier, + css::util::XCancellable, + css::sdbc::XCloseable> MacabCommonStatement_BASE; // Class MacabCommonStatement @@ -50,27 +50,27 @@ namespace connectivity public comphelper::OPropertyArrayUsageHelper<MacabCommonStatement> { - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + css::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; - MacabConnection* m_pConnection; // The owning Connection object - MacabHeader* m_pHeader; // The header of the address book on which to run queries (provided by m_pConnection) - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created + MacabConnection* m_pConnection; // The owning Connection object + MacabHeader* m_pHeader; // The header of the address book on which to run queries (provided by m_pConnection) + css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created protected: class MacabCondition *analyseWhereClause( - const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); + const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); class MacabOrder *analyseOrderByClause( - const OSQLParseNode *pParseNode) const throw(::com::sun::star::sdbc::SQLException); + const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); OUString getTableName( ) const; - void setMacabFields(class MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); - void selectRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); - void sortRecords(MacabResultSet *pResult) const throw(::com::sun::star::sdbc::SQLException); + void setMacabFields(class MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void selectRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void sortRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; @@ -78,26 +78,26 @@ namespace connectivity // 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) override; + const css::uno::Any& rValue) throw (css::uno::Exception) override; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle) const override; - virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); - virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); + virtual void resetParameters() const throw(css::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException); virtual ~MacabCommonStatement(); public: ::cppu::OBroadcastHelper& rBHelper; explicit MacabCommonStatement(MacabConnection *_pConnection); - using MacabCommonStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + using MacabCommonStatement_BASE::operator css::uno::Reference< css::uno::XInterface >; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -105,41 +105,41 @@ namespace connectivity // XInterface virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & rType - ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( + const css::uno::Type & rType + ) throw(css::uno::RuntimeException, std::exception) override; // 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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( + ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - ) throw(::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( + ) throw(css::uno::RuntimeException) override; // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( + const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; virtual sal_Int32 SAL_CALL executeUpdate( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; virtual sal_Bool SAL_CALL execute( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) 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) override; + const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( + ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( - ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getWarnings( + ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; virtual void SAL_CALL clearWarnings( - ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XCancellable virtual void SAL_CALL cancel( - ) throw(::com::sun::star::uno::RuntimeException) override; + ) throw(css::uno::RuntimeException) override; // XCloseable virtual void SAL_CALL close( - ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) override; + ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // other methods inline MacabConnection* getOwnConnection() const { return m_pConnection; } @@ -149,7 +149,7 @@ namespace connectivity // Class MacabStatement typedef ::cppu::ImplInheritanceHelper< - MacabCommonStatement, ::com::sun::star::lang::XServiceInfo > MacabStatement_BASE; + MacabCommonStatement, css::lang::XServiceInfo > MacabStatement_BASE; class MacabStatement : public MacabStatement_BASE { diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx index 93f294162436..58e43175dfe2 100644 --- a/connectivity/source/drivers/macab/MacabTable.hxx +++ b/connectivity/source/drivers/macab/MacabTable.hxx @@ -31,7 +31,7 @@ namespace connectivity class MacabTable : public MacabTable_TYPEDEF { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; MacabConnection* m_pConnection; public: diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index a4ddb819f490..926eec0d0370 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -29,15 +29,15 @@ namespace connectivity { class MacabTables : public sdbcx::OCollection { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: MacabTables( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData, + const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 17a42ed211e2..87208be6906d 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -60,7 +60,7 @@ class MacabConditionColumn : public MacabCondition public: MacabConditionColumn( const MacabHeader *header, - const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(css::sdbc::SQLException); virtual bool isAlwaysTrue() const override; virtual bool isAlwaysFalse() const override; }; @@ -70,7 +70,7 @@ class MacabConditionNull : public MacabConditionColumn public: MacabConditionNull( const MacabHeader *header, - const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(css::sdbc::SQLException); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -79,7 +79,7 @@ class MacabConditionNotNull : public MacabConditionColumn public: MacabConditionNotNull( const MacabHeader *header, - const OUString &sColumnName) throw(::com::sun::star::sdbc::SQLException); + const OUString &sColumnName) throw(css::sdbc::SQLException); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -92,7 +92,7 @@ class MacabConditionCompare : public MacabConditionColumn MacabConditionCompare( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); }; class MacabConditionEqual : public MacabConditionCompare @@ -101,7 +101,7 @@ class MacabConditionEqual : public MacabConditionCompare MacabConditionEqual( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -111,7 +111,7 @@ class MacabConditionDifferent : public MacabConditionCompare MacabConditionDifferent( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -121,7 +121,7 @@ class MacabConditionSimilar : public MacabConditionCompare MacabConditionSimilar( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(::com::sun::star::sdbc::SQLException); + const OUString &sMatchString) throw(css::sdbc::SQLException); virtual bool eval(const MacabRecord *aRecord) const override; }; diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index 4add2093f165..6d401bc548ba 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.hxx @@ -74,7 +74,7 @@ namespace connectivity } - inline com::sun::star::util::DateTime CFDateToDateTime(const CFDateRef _cfDate) + inline css::util::DateTime CFDateToDateTime(const CFDateRef _cfDate) { /* Carbon can give us the time since 2001 of any CFDateRef, * and it also stores the time since 1970 as a constant, @@ -82,7 +82,7 @@ namespace connectivity * CFDateRef. From there, it is just a matter of choosing what * we want to do with it. */ - com::sun::star::util::DateTime nRet; + css::util::DateTime nRet; double timeSince2001 = CFDateGetAbsoluteTime(_cfDate); time_t unixtime = timeSince2001+kCFAbsoluteTimeIntervalSince1970; struct tm *ptm = localtime(&unixtime); @@ -117,16 +117,16 @@ namespace connectivity switch(_abType) { case kABStringProperty: - dataType = ::com::sun::star::sdbc::DataType::CHAR; + dataType = css::sdbc::DataType::CHAR; break; case kABDateProperty: - dataType = ::com::sun::star::sdbc::DataType::TIMESTAMP; + dataType = css::sdbc::DataType::TIMESTAMP; break; case kABIntegerProperty: - dataType = ::com::sun::star::sdbc::DataType::INTEGER; + dataType = css::sdbc::DataType::INTEGER; break; case kABRealProperty: - dataType = ::com::sun::star::sdbc::DataType::FLOAT; + dataType = css::sdbc::DataType::FLOAT; break; default: dataType = -1; diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx index 71bb8b59ce5a..7598d7fcbe6c 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -31,7 +31,7 @@ namespace connectivity class OCatalog : public connectivity::sdbcx::OCatalog { OConnection* m_pConnection; // used to get the metadata - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: // implementation of the pure virtual methods @@ -39,7 +39,7 @@ namespace connectivity virtual void refreshViews() override ; virtual void refreshGroups() override; virtual void refreshUsers() override ; - 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: explicit OCatalog(OConnection* _pCon); diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx index 440e1c05516f..e857b0ffe961 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.cxx +++ b/connectivity/source/drivers/mork/MColumnAlias.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ) +OColumnAlias::OColumnAlias( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB ) { static const sal_Char* s_pProgrammaticNames[] = { @@ -82,7 +82,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun:: } -void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ) +void OColumnAlias::initialize( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB ) { Reference< XNameAccess > xAliasesNode( officecfg::Office::DataAccess::DriverSettings:: diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 3c6d39531e9f..c97149cd4bfe 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -56,7 +56,7 @@ namespace connectivity AliasMap m_aAliasMap; public: - explicit OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); + explicit OColumnAlias( const css::uno::Reference< css::lang::XMultiServiceFactory > & ); OString getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const; @@ -65,7 +65,7 @@ namespace connectivity private: - void initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); + void initialize( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB ); }; } } diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx index a8ace2978bfe..b49d0266c8d0 100644 --- a/connectivity/source/drivers/mork/MColumns.hxx +++ b/connectivity/source/drivers/mork/MColumns.hxx @@ -35,7 +35,7 @@ namespace connectivity OTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: OColumns( OTable* _pTable, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 633f84e3011f..301aa7b8000d 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -315,13 +315,13 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return TransactionIsolation::NONE; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { // if your driver has special database types you can return it here return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 3654b6926085..e87c01b5fe44 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -45,10 +45,10 @@ namespace connectivity // Mork Parser (history) MorkParser* m_pHistory; // Store Catalog - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; + css::uno::Reference< css::sdbcx::XTablesSupplier> m_xCatalog; public: - void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); + void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException); explicit OConnection(MorkDriver* const driver); virtual ~OConnection(); @@ -63,29 +63,29 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // 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( 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( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) 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 void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - 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; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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 void SAL_CALL clearWarnings() 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } @@ -93,10 +93,10 @@ namespace connectivity // Added to enable me to use SQLInterpreter which requires an // XNameAccess i/f to access tables. - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); + css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); - void throwSQLException( const ErrorDescriptor& _rError, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext ); - void throwSQLException( const sal_uInt16 _nErrorResourceId, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext ); + void throwSQLException( const ErrorDescriptor& _rError, const css::uno::Reference< css::uno::XInterface >& _rxContext ); + void throwSQLException( const sal_uInt16 _nErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext ); }; } } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index 541b522f8e27..931922ecf0ac 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -26,7 +26,7 @@ namespace connectivity OConnection* m_pConnection; MDatabaseMetaDataHelper* m_pMetaDataHelper; - ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); + ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( css::sdbc::SQLException ); protected: virtual ~ODatabaseMetaData(); @@ -35,7 +35,7 @@ namespace connectivity explicit ODatabaseMetaData(OConnection* _pCon); private: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() override; + virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override; // cached database information virtual OUString impl_getIdentifierQuoteString_throw( ) override; virtual bool impl_isCatalogAtStart_throw( ) override; @@ -53,131 +53,131 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - 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 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 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 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 supportsSchemasInProcedureCalls( ) 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 supportsCatalogsInProcedureCalls( ) 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 getMaxTableNameLength( ) 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 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 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 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 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 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 sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 8092c9a49977..16180de53257 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -59,16 +59,16 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( css::uno::Reference<css::uno::XInterface> xInstance = context_->getServiceManager()->createInstanceWithContext("com.sun.star.mozilla.MozillaBootstrap", context_); OSL_ENSURE( xInstance.is(), "failed to create instance" ); - css::uno::Reference<::com::sun::star::mozilla::XMozillaBootstrap> xMozillaBootstrap(xInstance, css::uno::UNO_QUERY); + css::uno::Reference<css::mozilla::XMozillaBootstrap> xMozillaBootstrap(xInstance, css::uno::UNO_QUERY); OSL_ENSURE( xMozillaBootstrap.is(), "failed to create instance" ); if (xMozillaBootstrap.is()) { - OUString defaultProfile = xMozillaBootstrap->getDefaultProfile(::com::sun::star::mozilla::MozillaProductType_Thunderbird); + OUString defaultProfile = xMozillaBootstrap->getDefaultProfile(css::mozilla::MozillaProductType_Thunderbird); if (!defaultProfile.isEmpty()) { - m_sProfilePath = xMozillaBootstrap->getProfilePath(::com::sun::star::mozilla::MozillaProductType_Thunderbird, defaultProfile); + m_sProfilePath = xMozillaBootstrap->getProfilePath(css::mozilla::MozillaProductType_Thunderbird, defaultProfile); SAL_INFO("connectivity.mork", "Using Thunderbird profile " << m_sProfilePath); } } diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index c5cc3fcbcfe2..52968d966aad 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -75,7 +75,7 @@ private: throw (css::uno::RuntimeException, std::exception) override; css::uno::Reference< css::uno::XComponentContext > context_; - css::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; OUString m_sProfilePath; }; diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 51c6bdb08664..e092f223501e 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -64,7 +64,7 @@ void SAL_CALL OPreparedStatement::disposing() OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , bool bAdjusted ) - throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) + throw ( css::sdbc::SQLException, css::uno::RuntimeException ) { StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted ); if ( eStatementType != eSelect ) @@ -123,7 +123,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt return aRet; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } @@ -313,13 +313,13 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBinaryStream", *this ); } @@ -478,17 +478,17 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< scanParameter(pParseNode->getChild(i),_rParaNodes); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return nullptr; } -sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return 0; } -sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return false; } diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 2bcfd9d15c59..65268bc7eef1 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -30,11 +30,11 @@ namespace connectivity namespace mork { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, - ::com::sun::star::sdbc::XParameters, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::sdbc::XMultipleResults, - ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; + typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XResultSetMetaDataSupplier, + css::sdbc::XMultipleResults, + css::lang::XServiceInfo> OPreparedStatement_BASE; class OPreparedStatement : public OCommonStatement, public OPreparedStatement_BASE @@ -42,23 +42,23 @@ namespace connectivity protected: // Data attributes - OUString m_sSqlStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + OUString m_sSqlStatement; + css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; ::rtl::Reference< OResultSet > m_pResultSet; ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns OValueRow m_aParameterRow; protected: 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; virtual ~OPreparedStatement(); virtual void SAL_CALL disposing() override; // OCommonStatement overridables virtual StatementType - parseSql( const OUString& sql , bool bAdjusted = false) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) override; + parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException ) override; virtual void initializeResultSet( OResultSet* _pResult ) override; virtual void clearCachedResultSet() override; virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) override; @@ -68,7 +68,7 @@ namespace connectivity void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); void AddParameter(connectivity::OSQLParseNode * pParameter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); + const css::uno::Reference< css::beans::XPropertySet>& _xCol); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); void describeParameter(); @@ -80,47 +80,47 @@ namespace connectivity void lateInit(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // 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 sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; - 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; - 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; - 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; - 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; - 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; - 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; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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; - 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; - 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; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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; - 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; - 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; - 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; - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // 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 sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; public: using OCommonStatement::executeQuery; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 5511274c0966..5cb7c3212f39 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -55,7 +55,7 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< OUString > aSupported(2); + css::uno::Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; return aSupported; @@ -129,9 +129,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) { - OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } @@ -277,7 +277,7 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw } -Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { return Any(); } @@ -289,7 +289,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLEx } -void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException) +void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException) { if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size()) ::dbtools::throwInvalidIndexException(*this); @@ -572,19 +572,19 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); @@ -600,7 +600,7 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & /*rOldValue*/, sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { OSL_FAIL( "OResultSet::convertFastPropertyValue: not implemented!" ); switch(nHandle) @@ -608,7 +608,7 @@ sal_Bool OResultSet::convertFastPropertyValue( case PROPERTY_ID_ISBOOKMARKABLE: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_FETCHDIRECTION: case PROPERTY_ID_FETCHSIZE: default: @@ -675,7 +675,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -1106,8 +1106,8 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) } -void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::executeQuery() throw( css::sdbc::SQLException, + css::uno::RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -1515,7 +1515,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin } -::com::sun::star::uno::Any OResultSet::getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any OResultSet::getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); @@ -1526,7 +1526,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row"); return makeAny((sal_Int32)(m_aRow->get())[0]); } -sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); SAL_INFO( @@ -1536,7 +1536,7 @@ sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark fetchCurrentRow(); return true; } -sal_Bool OResultSet::moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); SAL_INFO( @@ -1546,7 +1546,7 @@ sal_Bool OResultSet::moveRelativeToBookmark( const ::com::sun::star::uno::Any& m_nRowPos = getRowForCardNumber(nCardNum); return seekRow(RELATIVE_POS,rows ); } -sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, const ::com::sun::star::uno::Any& rhs ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno::Any& rhs ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1567,13 +1567,13 @@ sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, c return nResult; } -sal_Bool OResultSet::hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool OResultSet::hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return true; } -sal_Int32 OResultSet::hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 OResultSet::hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1692,25 +1692,25 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -1722,7 +1722,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { updateBinaryStream(columnIndex,x,length); } @@ -1754,7 +1754,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& // XResultSetUpdate -void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "in, m_nRowPos = " << m_nRowPos); @@ -1766,27 +1766,27 @@ void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLExcepti SAL_INFO("connectivity.mork", "out, m_nRowPos = " << m_nRowPos); } -void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::updateRow( ) not implemented" ); } -void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::deleteRow( ) not implemented" ); } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::cancelRowUpdates( ) not implemented" ); } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::moveToInsertRow( ) not implemented" ); } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index be7257ff0588..a80e87a8e02b 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -49,18 +49,18 @@ namespace connectivity /* ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet, + css::sdbc::XRow, + css::sdbc::XResultSetMetaDataSupplier, + css::util::XCancellable, + css::sdbc::XWarningsSupplier, + css::sdbc::XCloseable, + css::sdbc::XColumnLocate, + css::sdbc::XResultSetUpdate, + css::sdbc::XRowUpdate, + css::sdbcx::XRowLocate, + css::sdbcx::XDeleteRows, + css::lang::XServiceInfo> OResultSet_BASE; typedef sal_Int64 TVoidPtr; @@ -74,11 +74,11 @@ namespace connectivity { protected: OCommonStatement* m_pStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + css::uno::Reference< css::uno::XInterface> m_xStatement; + css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; sal_uInt32 m_nRowPos; sal_uInt32 m_nOldRowPos; - bool m_bWasNull; + bool m_bWasNull; sal_Int32 m_nFetchSize; sal_Int32 m_nResultSetType; sal_Int32 m_nFetchDirection; @@ -95,18 +95,18 @@ namespace connectivity 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 + const css::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception, std::exception) override; + throw (css::uno::Exception, std::exception) override; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle ) const override; @@ -120,112 +120,112 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::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; - 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( 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; + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // 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; // 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; // XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; protected: //MQuery m_aQuery; MQueryHelper m_aQueryHelper; OTable* m_pTable; sal_Int32 m_CurrentRowCount; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + css::uno::Reference< css::container::XNameAccess > m_xTableColumns; ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; - ::com::sun::star::uno::Sequence< OUString> m_aColumnNames; + css::uno::Sequence< OUString> m_aColumnNames; OValueRow m_aRow; OValueRow m_aParameterRow; ::std::vector< OUString> m_aAttributeStrings; @@ -255,10 +255,10 @@ protected: sal_uInt32 currentRowCount(); - bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false) throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); - bool fetchCurrentRow() throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false) throw( css::sdbc::SQLException, + css::uno::RuntimeException); + bool fetchCurrentRow() throw( css::sdbc::SQLException, + css::uno::RuntimeException); static bool pushCard(sal_uInt32 ) { return true; } bool validRow( sal_uInt32 nRow ); bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); @@ -266,17 +266,17 @@ protected: bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(css::sdbc::SQLException, css::uno::RuntimeException); - void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static void checkPendingUpdate() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + static void checkPendingUpdate() throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getCurrentCardNumber(); public: bool determineReadOnly(); // MozAddressbook Specific methods - void SAL_CALL executeQuery() throw( ::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + void SAL_CALL executeQuery() throw( css::sdbc::SQLException, + css::uno::RuntimeException); void setTable(OTable* _rTable); @@ -297,14 +297,14 @@ public: inline sal_Int32 mapColumn(sal_Int32 column); - void checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException); + void checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException); static void setBoundedColumns( const OValueRow& _rRow, const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xNames, + const css::uno::Reference< css::container::XIndexAccess>& _xNames, bool _bSetColumnMapping, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, + const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData, ::std::vector<sal_Int32>& _rColMapping); ::osl::Mutex& getMutex() { return m_aMutex; } diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index d9e12bdaa127..24990110bb57 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index f3f9da432a7f..1aea863bb026 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -34,7 +34,7 @@ namespace connectivity //************ Class: ResultSetMetaData - typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper<css::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE { @@ -58,28 +58,28 @@ namespace connectivity {} - void checkColumnIndex(sal_Int32 column) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) 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; + void checkColumnIndex(sal_Int32 column) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; }; } } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index f2aeba6d72a1..3a4279a01ffa 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -319,23 +319,23 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc Sequence< Property > aProps(9); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -352,7 +352,7 @@ sal_Bool OCommonStatement::convertFastPropertyValue( Any & /*rOldValue*/, sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { bool bConverted = false; // here we have to try to convert @@ -416,7 +416,7 @@ void SAL_CALL OStatement::release() throw() OCommonStatement::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index aa52471715c2..0f23533f317e 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -34,9 +34,9 @@ namespace connectivity { class OResultSet; - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XStatement, + css::sdbc::XWarningsSupplier, + css::sdbc::XCloseable> OCommonStatement_IBASE; //************ Class: OCommonStatement @@ -54,12 +54,12 @@ namespace connectivity friend class ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE >; private: - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + css::sdbc::SQLWarning m_aLastWarning; protected: - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet > m_xResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns + css::uno::WeakReference< css::sdbc::XResultSet > m_xResultSet; + css::uno::Reference< css::sdbc::XDatabaseMetaData> m_xDBMetaData; + css::uno::Reference< css::container::XNameAccess> m_xColNames; // table columns // for this Statement @@ -85,16 +85,16 @@ namespace connectivity // 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; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, + css::uno::Any& rValue, sal_Int32 nHandle) const override; virtual ~OCommonStatement(); @@ -106,7 +106,7 @@ namespace connectivity /** called to do the parsing of a to-be-executed SQL statement, and set all members as needed */ virtual StatementType - parseSql( const OUString& sql , bool bAdjusted = false) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException ); /** called to initialize a result set, according to a previously parsed SQL statement */ virtual void initializeResultSet( OResultSet* _pResult ); @@ -120,7 +120,7 @@ namespace connectivity /** executes the current query (the one which has been passed to the last parseSql call) */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > + css::uno::Reference< css::sdbc::XResultSet > impl_executeCurrentQuery(); void createColumnMapping(); @@ -133,7 +133,7 @@ namespace connectivity OConnection* getOwnConnection() const { return m_pConnection;} explicit OCommonStatement(OConnection* _pConnection ); - using OCommonStatement_IBASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; + using OCommonStatement_IBASE::operator css::uno::Reference< css::uno::XInterface >; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -142,29 +142,29 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; //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 css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, 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 ; - 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 ; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; // 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 void SAL_CALL clearWarnings( ) 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(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; protected: using OPropertySetHelper::getFastPropertyValue; }; class OStatement : public OCommonStatement, - public ::com::sun::star::lang::XServiceInfo + public css::lang::XServiceInfo { protected: virtual ~OStatement(){} @@ -173,7 +173,7 @@ namespace connectivity explicit OStatement( OConnection* _pConnection); DECLARE_SERVICE_INFO(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; }; diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index cb5ce62656af..7a96a3d622fa 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -27,13 +27,12 @@ namespace connectivity { class OTables : public sdbcx::OCollection { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - // OCatalog* m_pParent; + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; public: - OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, + OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xMetaData(_rMetaData) {} diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index d1a9b7ede5d1..82cc40e56b9c 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -36,7 +36,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; static MozillaBootstrap *pMozillaBootstrap=nullptr; static Reference<XMozillaBootstrap> xMozillaBootstrap; -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) { if (!pMozillaBootstrap) { @@ -60,7 +60,7 @@ MozillaBootstrap::~MozillaBootstrap() void MozillaBootstrap::Init() { m_ProfileAccess = new ProfileAccess(); - bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString()); + bootupProfile(css::mozilla::MozillaProductType_Mozilla,OUString()); } @@ -104,55 +104,55 @@ Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) thr // XProfileDiscover -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfileCount(product); } -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfileList(product,list); } -OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception) { return m_ProfileAccess->getDefaultProfile(product); } -OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfilePath(product,profileName); } -sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) { return m_ProfileAccess->isProfileLocked(product,profileName); } -sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfileExists(product,profileName); } // XProfileManager -::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return -1; } -::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (css::uno::RuntimeException, std::exception) { return -1; } -::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (css::uno::RuntimeException, std::exception) { - return ::com::sun::star::mozilla::MozillaProductType_Default; + return css::mozilla::MozillaProductType_Default; } -OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (css::uno::RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (css::uno::RuntimeException, std::exception) { return true; } -OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ @@ -160,7 +160,7 @@ OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla } // XProxyRunner -::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception) { (void)aCode; /* avoid warning about unused parameter */ return -1; diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index e887aec00910..188f54d3d5d7 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -31,8 +31,8 @@ namespace connectivity { namespace mozab { - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::mozilla::XMozillaBootstrap, - ::com::sun::star::lang::XServiceInfo > OMozillaBootstrap_BASE; + typedef ::cppu::WeakComponentImplHelper< css::mozilla::XMozillaBootstrap, + css::lang::XServiceInfo > OMozillaBootstrap_BASE; class ProfileAccess; class ProfileManager; class MozillaBootstrap : public OMozillaBootstrap_BASE @@ -50,34 +50,34 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::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; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XMozillaBootstrap // XProfileDiscover - virtual ::sal_Int32 SAL_CALL getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; // XProfileManager - virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCurrentProfile( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; // XProxyRunner - virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception) override; }; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index 114d20aad14b..f443797990e6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -27,7 +27,7 @@ #include <rtl/ustring.hxx> -OUString getRegistryDir(::com::sun::star::mozilla::MozillaProductType product); +OUString getRegistryDir(css::mozilla::MozillaProductType product); #endif diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 9ae1685703cf..b0aa61ab8af0 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -21,7 +21,7 @@ #include <rtl/byteseq.hxx> #include <osl/diagnose.h> -IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException, std::exception) +IniParser::IniParser(OUString const & rIniName) throw(css::io::IOException, std::exception) { OUString iniUrl; if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData)) @@ -38,7 +38,7 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce if (!iniUrl.isEmpty()) fileError = osl_openFile(iniUrl.pData, &handle, osl_File_OpenFlag_Read); } - catch(const ::com::sun::star::io::IOException&) + catch(const css::io::IOException&) { #if OSL_DEBUG_LEVEL > 0 OString file_tmp = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index d2b8356b2843..7fb917f23208 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -140,7 +140,7 @@ namespace connectivity return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } - OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -153,13 +153,13 @@ namespace connectivity return rProduct.mProfileList[profileName]->getProfilePath(); } - ::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } - ::sal_Int32 ProfileAccess::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -177,7 +177,7 @@ namespace connectivity return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } - OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) + OUString ProfileAccess::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -194,14 +194,14 @@ namespace connectivity ProfileStruct * aProfile = (*rProduct.mProfileList.begin()).second; return aProfile->getProfileName(); } - bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return true; } - bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) + bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index ad7e85706ec2..7472fc226573 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -71,12 +71,12 @@ namespace connectivity virtual ~ProfileAccess(); ProfileAccess(); - OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Int32 getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException); - OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + ::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException); + ::sal_Int32 getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException); + OUString getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException); + bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); protected: ProductStruct m_ProductProfileList[4]; void LoadProductsInfo(); diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index dc308461b0ed..3655fa4f5a3d 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -44,7 +44,7 @@ namespace connectivity namespace mysql { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) + Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) { return *(new ODriverDelegator( comphelper::getComponentContext(_rxFac) )); } diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index a34406e7bb67..667e48af3c89 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -160,7 +160,7 @@ Sequence< sal_Int8 > OMySQLTable::getUnoTunnelImplementationId() return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// css::lang::XUnoTunnel sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index f90b496e6f8a..7a81dd2bbafe 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -36,13 +36,13 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true) +OMySQLUser::OMySQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(true) ,m_xConnection(_xConnection) { construct(); } -OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, +OMySQLUser::OMySQLUser( const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const OUString& Name ) : connectivity::sdbcx::OUser(Name, true) ,m_xConnection(_xConnection) @@ -54,7 +54,7 @@ void OMySQLUser::refreshGroups() { } -OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OMySQLUser(_xConnection) +OUserExtend::OUserExtend( const css::uno::Reference< css::sdbc::XConnection >& _xConnection) : OMySQLUser(_xConnection) { construct(); } diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index 32b10fcff4a5..834c9461ff9a 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; OUsers::OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, + const css::uno::Reference< css::sdbc::XConnection >& _xConnection, connectivity::sdbcx::IRefreshableUsers* _pParent) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xConnection(_xConnection) diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index cb5052bf5dd5..7b228fd4867c 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -452,7 +452,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return nTxn; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -461,7 +461,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx index 93b94c00bec9..65336c2095a2 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx @@ -1261,16 +1261,16 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(S switch(nValue) { case SQL_TXN_READ_UNCOMMITTED: - nValueTranslated = com::sun::star::sdbc::TransactionIsolation::READ_UNCOMMITTED; + nValueTranslated = css::sdbc::TransactionIsolation::READ_UNCOMMITTED; break; case SQL_TXN_READ_COMMITTED: - nValueTranslated = com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED; + nValueTranslated = css::sdbc::TransactionIsolation::READ_COMMITTED; break; case SQL_TXN_REPEATABLE_READ: - nValueTranslated = com::sun::star::sdbc::TransactionIsolation::REPEATABLE_READ; + nValueTranslated = css::sdbc::TransactionIsolation::REPEATABLE_READ; break; case SQL_TXN_SERIALIZABLE: - nValueTranslated = com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE; + nValueTranslated = css::sdbc::TransactionIsolation::SERIALIZABLE; break; default: nValueTranslated = 0; diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 80a28982065e..8160b8a1cd1a 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -190,13 +190,13 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBinaryStream", *this ); return nullptr; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getCharacterStream", *this ); return nullptr; @@ -267,7 +267,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co } -::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -374,7 +374,7 @@ Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*colum } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this ); return Any(); @@ -405,7 +405,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -422,7 +422,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -707,18 +707,18 @@ OUString ODatabaseMetaDataResultSet::getCursorName() throw(SQLException, Runtime ::cppu::IPropertyArrayHelper* ODatabaseMetaDataResultSet::createArrayHelper( ) const { - Sequence< com::sun::star::beans::Property > aProps(5); - com::sun::star::beans::Property* pProperties = aProps.getArray(); + Sequence< css::beans::Property > aProps(5); + css::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -734,14 +734,14 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { switch(nHandle) { case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_FETCHDIRECTION: return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); case PROPERTY_ID_FETCHSIZE: diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index 0272090c1b9a..aad846a8e753 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -ODBCDriver::ODBCDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) +ODBCDriver::ODBCDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) :ODriver_BASE(m_aMutex) ,m_xORB(_rxFactory) ,m_pDriverHandle(SQL_NULL_HANDLE) diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index d4119236ba20..3ed72e2cbddc 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -105,7 +105,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt return aRet.hasValue() ? aRet : OPreparedStatement_BASE::queryInterface(rType); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OStatement_BASE2::getTypes()); } @@ -643,7 +643,7 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { // LEM: It is quite unclear to me what the interface here is. // The XInputStream provides *bytes*, not characters. @@ -651,7 +651,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { setStream(parameterIndex, x, length, DataType::LONGVARBINARY); } diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index 3a8ad96c11b5..0178027e1d34 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -96,7 +96,7 @@ namespace connectivity virtual oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const override; virtual SQLHANDLE EnvironmentHandle(OUString &_rPath) override; public: - explicit ORealObdcDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {} + explicit ORealObdcDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {} }; @@ -322,7 +322,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) { return *(new ORealObdcDriver(_rxFactory)); } diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index 01ff93f8c456..2b9e3d6ed883 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -32,11 +32,9 @@ namespace com { namespace sun { namespace star { namespace connectivity { namespace odbc { -com::sun::star::uno::Reference< com::sun::star::uno::XInterface > -ODBCDriver_CreateInstance( - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > - const & factory) - throw (com::sun::star::uno::Exception); +css::uno::Reference< css::uno::XInterface > +ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory) + throw (css::uno::Exception); } } diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index fa327bcfa22a..859181de4094 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -356,9 +356,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) { - OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(), - cppu::UnoType<com::sun::star::beans::XPropertySet>::get()); + OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(), + cppu::UnoType<css::beans::XFastPropertySet>::get(), + cppu::UnoType<css::beans::XPropertySet>::get()); return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } @@ -612,7 +612,7 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { return getValue<ORowSetValue>( columnIndex ).makeAny(); } @@ -1389,7 +1389,7 @@ void OResultSet::setFetchSize(sal_Int32 _par0) OSL_ENSURE(_par0>0,"Illegal fetch size!"); if ( _par0 != 1 ) { - throw ::com::sun::star::beans::PropertyVetoException("SDBC/ODBC layer not prepared for fetchSize > 1", *this); + throw css::beans::PropertyVetoException("SDBC/ODBC layer not prepared for fetchSize > 1", *this); } if ( _par0 > 0 ) { @@ -1406,22 +1406,22 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, cppu::UnoType<bool>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); @@ -1437,7 +1437,7 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { switch(nHandle) { @@ -1445,7 +1445,7 @@ sal_Bool OResultSet::convertFastPropertyValue( case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); case PROPERTY_ID_FETCHDIRECTION: return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, getFetchDirection()); case PROPERTY_ID_FETCHSIZE: @@ -1636,7 +1636,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx index 060e94057262..f8bccd491b90 100644 --- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx @@ -78,7 +78,7 @@ OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection ,SQLHANDLE _aStatementHandle - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface + ,const css::uno::Reference< css::uno::XInterface >& _xInterface ,sal_Int32 _column ,sal_Int32 _ident) throw(SQLException, RuntimeException) { @@ -109,9 +109,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection ,SQLHANDLE _aStatementHandle - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface + ,const css::uno::Reference< css::uno::XInterface >& _xInterface ,sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(css::sdbc::SQLException, css::uno::RuntimeException) { SQLSMALLINT nType = 0; try @@ -244,7 +244,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return nType; } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { sal_Int32 nType = 0; try diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 4cf5310c2ec8..9d8c7102fa54 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -880,25 +880,25 @@ void OStatement_Base::setUsingBookmarks(bool _bUseBookmark) Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), + pProperties[nPos++] = css::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), PROPERTY_ID_USEBOOKMARKS, cppu::UnoType<bool>::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); @@ -915,7 +915,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (::com::sun::star::lang::IllegalArgumentException) + throw (css::lang::IllegalArgumentException) { bool bConverted = false; try @@ -1085,7 +1085,7 @@ OResultSet* OStatement_Base::createResulSet() return new OResultSet(m_aStatementHandle,this); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index 71109fb06884..3b4d5f09bea1 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -127,9 +127,9 @@ void OTools::getValue( OConnection* _pConnection, sal_Int32 columnIndex, SQLSMALLINT _nType, bool &_bWasNull, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, + const css::uno::Reference< css::uno::XInterface >& _xInterface, void* _pValue, - SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + SQLLEN _nSize) throw(css::sdbc::SQLException, css::uno::RuntimeException) { const size_t properSize = sqlTypeLen(_nType); if ( properSize == static_cast<size_t>(-1) ) @@ -168,9 +168,9 @@ void OTools::bindValue( OConnection* _pConnection, const void* _pValue, void* _pData, SQLLEN * const pLen, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, + const css::uno::Reference< css::uno::XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding, - bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + bool _bUseOldTimeDate) throw(css::sdbc::SQLException, css::uno::RuntimeException) { SQLRETURN nRetcode; SQLSMALLINT fSqlType; @@ -248,8 +248,8 @@ void OTools::bindValue( OConnection* _pConnection, case SQL_BINARY: case SQL_VARBINARY: { - _pData = const_cast<sal_Int8 *>(static_cast<const ::com::sun::star::uno::Sequence< sal_Int8 > *>(_pValue)->getConstArray()); - *pLen = static_cast<const ::com::sun::star::uno::Sequence< sal_Int8 > *>(_pValue)->getLength(); + _pData = const_cast<sal_Int8 *>(static_cast<const css::uno::Sequence< sal_Int8 > *>(_pValue)->getConstArray()); + *pLen = static_cast<const css::uno::Sequence< sal_Int8 > *>(_pValue)->getLength(); } break; case SQL_LONGVARBINARY: { @@ -257,7 +257,7 @@ void OTools::bindValue( OConnection* _pConnection, * for an explanation of that apparently weird cast */ _pData = reinterpret_cast<void*>((uintptr_t)columnIndex); sal_Int32 nLen = 0; - nLen = static_cast<const ::com::sun::star::uno::Sequence< sal_Int8 > *>(_pValue)->getLength(); + nLen = static_cast<const css::uno::Sequence< sal_Int8 > *>(_pValue)->getLength(); *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen); } break; 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; |