diff options
Diffstat (limited to 'connectivity/source/drivers/evoab2')
23 files changed, 262 insertions, 263 deletions
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 8b7b5cd1bc00..f8b904852c6e 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -131,7 +131,7 @@ bool EApiInit() for( guint j = 0; j < G_N_ELEMENTS( eBookLibNames ); j++ ) { - aModule = osl_loadModule( rtl::OUString::createFromAscii + aModule = osl_loadModule( OUString::createFromAscii ( eBookLibNames[ j ] ).pData, SAL_LOADMODULE_DEFAULT ); diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index 4d035ff4c903..06be9242db79 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -42,15 +42,15 @@ OEvoabCatalog::OEvoabCatalog(OEvoabConnection* _pCon) : void OEvoabCatalog::refreshTables() { TStringVector aVector; - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("TABLE"); + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("TABLE"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - ::rtl::OUString aName; + OUString aName; while(xResult->next()) { diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index b131bc36bb95..9f05ea22a80b 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::lang; using namespace connectivity::evoab; // ------------------------------------------------------------------------- -sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getTableName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getTableName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns( aCatalog, sSchemaName, diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index b5a183484b05..0d5c9a03ed42 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -32,7 +32,7 @@ namespace connectivity protected: OEvoabTable* m_pTable; - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 2602f34480a5..680a8ea2d121 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -40,27 +40,27 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; -::rtl::OUString implGetExceptionMsg( Exception& e, const ::rtl::OUString& aExceptionType_ ) +OUString implGetExceptionMsg( Exception& e, const OUString& aExceptionType_ ) { - ::rtl::OUString aExceptionType = aExceptionType_; + OUString aExceptionType = aExceptionType_; if( aExceptionType.isEmpty() ) - aExceptionType = ::rtl::OUString("Unknown") ; + aExceptionType = OUString("Unknown") ; - ::rtl::OUString aTypeLine( "\nType: " ); + OUString aTypeLine( "\nType: " ); aTypeLine += aExceptionType; - ::rtl::OUString aMessageLine( "\nMessage: " ); - aMessageLine += ::rtl::OUString( e.Message ); + OUString aMessageLine( "\nMessage: " ); + aMessageLine += OUString( e.Message ); - ::rtl::OUString aMsg(aTypeLine); + OUString aMsg(aTypeLine); aMsg += aMessageLine; return aMsg; } // Exception type unknown -::rtl::OUString implGetExceptionMsg( Exception& e ) +OUString implGetExceptionMsg( Exception& e ) { - ::rtl::OUString aMsg = implGetExceptionMsg( e, ::rtl::OUString() ); + OUString aMsg = implGetExceptionMsg( e, OUString() ); return aMsg; } @@ -93,12 +93,12 @@ void SAL_CALL OEvoabConnection::release() throw() IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection") //----------------------------------------------------------------------------- -void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) +void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) { osl_atomic_increment( &m_refCount ); SAL_INFO("evoab2", "OEvoabConnection::construct()::url = " << url ); - ::rtl::OUString sPassword; + OUString sPassword; const char* pPwd = "password"; const PropertyValue *pIter = info.getConstArray(); @@ -119,12 +119,12 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro else setSDBCAddressType(SDBCAddress::EVO_LOCAL); setURL(url); - setPassword(::rtl::OUStringToOString(sPassword,RTL_TEXTENCODING_UTF8)); + setPassword(OUStringToOString(sPassword,RTL_TEXTENCODING_UTF8)); osl_atomic_decrement( &m_refCount ); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { // when you need to transform SQL92 to you driver specific you can do it here return _sSql; @@ -170,7 +170,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQL return xStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -183,7 +183,7 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( con return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw( SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; @@ -248,14 +248,14 @@ sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) throw(SQLException, RuntimeEx { return sal_False; } -void SAL_CALL OEvoabConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } -::rtl::OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) { diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 1fc9764cb60b..772bfce483b1 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -58,17 +58,17 @@ namespace connectivity SDBCAddress::sdbc_address_type m_eSDBCAddressType; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > m_xCatalog; - ::rtl::OString m_aPassword; + OString m_aPassword; ::dbtools::WarningsContainer m_aWarnings; virtual ~OEvoabConnection(); public: OEvoabConnection( OEvoabDriver& _rDriver ); - virtual void construct(const ::rtl::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 ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); - inline rtl::OString getPassword() { return m_aPassword; } - inline void setPassword( rtl::OString aStr ) { m_aPassword = aStr; } + inline OString getPassword() { return m_aPassword; } + inline void setPassword( OString aStr ) { m_aPassword = aStr; } // own methods inline const OEvoabDriver& getDriver() const { return m_rDriver; } @@ -86,9 +86,9 @@ namespace connectivity // 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); - 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); - 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); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + 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); + 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); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -97,8 +97,8 @@ namespace connectivity 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); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); 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); diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index a214bd106019..8f3198234c26 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -177,14 +177,14 @@ namespace connectivity return nType == G_TYPE_STRING ? DataType::VARCHAR : DataType::BIT; } - guint findEvoabField(const rtl::OUString& aColName) + guint findEvoabField(const OUString& aColName) { guint nRet = (guint)-1; sal_Bool bFound = sal_False; initFields(); for (guint i=0;(i < nFields) && !bFound;i++) { - rtl::OUString aName = getFieldName(i); + OUString aName = getFieldName(i); if (aName == aColName) { nRet = i; @@ -194,30 +194,30 @@ namespace connectivity return nRet; } - rtl::OUString + OUString getFieldTypeName( guint nCol ) { switch( getFieldType( nCol ) ) { case DataType::BIT: - return ::rtl::OUString("BIT"); + return OUString("BIT"); case DataType::VARCHAR: - return ::rtl::OUString("VARCHAR"); + return OUString("VARCHAR"); default: break; } - return ::rtl::OUString(); + return OUString(); } - rtl::OUString + OUString getFieldName( guint nCol ) { const GParamSpec *pSpec = getField( nCol )->pField; - rtl::OUString aName; + OUString aName; initFields(); if( pSpec ) - aName = rtl::OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ), + aName = OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ), RTL_TEXTENCODING_UTF8 ); aName = aName.replace( '-', '_' ); return aName; @@ -259,7 +259,7 @@ OEvoabDatabaseMetaData::~OEvoabDatabaseMetaData() } // ------------------------------------------------------------------------- -ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const ::rtl::OUString& columnNamePattern ) +ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const OUString& columnNamePattern ) { static ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); @@ -270,9 +270,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const // **************************************************** // Catalog - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[1] = new ORowSetValueDecorator(OUString("")); // Schema - aRow[2] = new ORowSetValueDecorator(::rtl::OUString("")); + aRow[2] = new ORowSetValueDecorator(OUString("")); // COLUMN_SIZE aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE); // BUFFER_LENGTH, not used @@ -294,10 +294,10 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const // CHAR_OCTET_LENGTH, refer to [5] aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH); // IS_NULLABLE - aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES")); + aRow[18] = new ORowSetValueDecorator(OUString("YES")); - aRow[3] = new ORowSetValueDecorator(::rtl::OUString("TABLE")); + aRow[3] = new ORowSetValueDecorator(OUString("TABLE")); ::osl::MutexGuard aGuard( m_aMutex ); initFields(); @@ -320,9 +320,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const return aRows ; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) @@ -442,22 +442,22 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(S return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " - ::rtl::OUString aVal("\""); + OUString aVal("\""); return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aVal; + OUString aVal; return aVal; } // ------------------------------------------------------------------------- @@ -791,52 +791,52 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) thro return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)1); + OUString aValue = OUString::valueOf((sal_Int32)1); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)0); + OUString aValue = OUString::valueOf((sal_Int32)0); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- @@ -855,36 +855,36 @@ sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) throw(Runti return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { - ::rtl::OUString aValue; + OUString aValue; return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -1002,16 +1002,16 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw /* Dont need to change as evoab driver supports only table */ // there exists no possibility to get table types so we have to check - static ::rtl::OUString sTableTypes[] = + static OUString sTableTypes[] = { - ::rtl::OUString("TABLE"), + OUString("TABLE"), // Currently we only support a 'TABLE' nothing more complex }; ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; // here we fill the rows which should be visible when ask for data from the resultset returned here - sal_Int32 nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString); + sal_Int32 nSize = sizeof(sTableTypes) / sizeof(OUString); ODatabaseMetaDataResultSet::ORows aRows; for(sal_Int32 i=0;i < nSize;++i) { @@ -1043,7 +1043,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.reserve(19); aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR"))); + aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR"))); aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -1065,7 +1065,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR")); + aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR")); aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32)65535); aRows.push_back(aRow); @@ -1075,8 +1075,8 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*tableNamePattern*/, - const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/, + const OUString& columnNamePattern ) throw(SQLException, RuntimeException) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -1097,8 +1097,8 @@ bool isSourceBackend(ESource *pSource, const char *backendname) } Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, - const ::rtl::OUString& /*tableNamePattern*/, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, + const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1108,7 +1108,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( // check if any type is given // when no types are given then we have to return all tables e.g. TABLE - const ::rtl::OUString aTable("TABLE"); + const OUString aTable("TABLE"); sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); @@ -1116,8 +1116,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( { bTableFound = sal_False; - const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; + const OUString* pBegin = types.getConstArray(); + const OUString* pEnd = pBegin + nLength; for(;pBegin != pEnd;++pBegin) { if(*pBegin == aTable) @@ -1212,7 +1212,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( { ESource *pSource = E_SOURCE (s->data); - rtl::OUString aName = rtl::OStringToOUString( e_source_peek_name( pSource ), + OUString aName = OStringToOUString( e_source_peek_name( pSource ), RTL_TEXTENCODING_UTF8 ); ODatabaseMetaDataResultSet::ORow aRow(3); @@ -1230,7 +1230,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaDaza::getUDTs", *this ); return NULL; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 7079bf30a511..87ded8659ef2 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -54,9 +54,9 @@ namespace connectivity const ColumnProperty *getField(guint n); GType getGFieldType(guint nCol) ; sal_Int32 getFieldType(guint nCol) ; - rtl::OUString getFieldTypeName(guint nCol) ; - rtl::OUString getFieldName(guint nCol) ; - guint findEvoabField(const rtl::OUString& aColName); + OUString getFieldTypeName(guint nCol) ; + OUString getFieldName(guint nCol) ; + guint findEvoabField(const OUString& aColName); void free_column_resources(); @@ -64,14 +64,14 @@ namespace connectivity { OEvoabConnection* m_pConnection; - ODatabaseMetaDataResultSet::ORows& getColumnRows( const ::rtl::OUString& columnNamePattern ); + ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString& columnNamePattern ); protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information - virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ); virtual sal_Bool impl_isCatalogAtStart_throw( ); - virtual ::rtl::OUString impl_getCatalogSeparator_throw( ); + virtual OUString impl_getCatalogSeparator_throw( ); virtual sal_Bool impl_supportsCatalogsInTableDefinitions_throw( ); virtual sal_Bool impl_supportsSchemasInTableDefinitions_throw( ) ; virtual sal_Bool impl_supportsCatalogsInDataManipulation_throw( ); @@ -93,17 +93,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -116,13 +116,13 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -148,9 +148,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -198,9 +198,9 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL 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); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -213,7 +213,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::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); + 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); }; } } diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 86f36afd6db6..601a111630c5 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -78,40 +78,40 @@ void OEvoabDriver::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString(EVOAB_DRIVER_IMPL_NAME); + return OUString(EVOAB_DRIVER_IMPL_NAME); // this name is referenced in the configuration and in the evoab.xml // Please take care when changing it. } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported // for more information @see com.sun.star.sdbc.Driver - Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); + Sequence< OUString > aSNS( 1 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL OEvoabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; return pSupported != pEnd; } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -122,7 +122,7 @@ Sequence< ::rtl::OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) return *(new OEvoabDriver(_rxFactory)); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -139,19 +139,19 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString& return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return acceptsURL_Stat(url); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( ! acceptsURL(url) ) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); + const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } // if ( ! acceptsURL(url) ) @@ -170,7 +170,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException) return 0; } // -------------------------------------------------------------------------------- -sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url ) +sal_Bool OEvoabDriver::acceptsURL_Stat( const OUString& url ) { return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit(); } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index a6bcf2ed85e2..60802e64697c 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -62,19 +62,19 @@ namespace connectivity virtual void SAL_CALL disposing(void); // 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 OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // 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); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - 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); + 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); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + 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); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); @@ -85,7 +85,7 @@ namespace connectivity getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); } // static methods - static sal_Bool acceptsURL_Stat( const ::rtl::OUString& url ); + static sal_Bool acceptsURL_Stat( const OUString& url ); }; } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 3265547c84f6..e067c8d06806 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -51,7 +51,7 @@ OEvoabPreparedStatement::OEvoabPreparedStatement( OEvoabConnection* _pConnection } // ----------------------------------------------------------------------------- -void OEvoabPreparedStatement::construct( const ::rtl::OUString& _sql ) +void OEvoabPreparedStatement::construct( const OUString& _sql ) { m_sSqlStatement = _sql; @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException } // ------------------------------------------------------------------------- -void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const ::rtl::OUString& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setString", *this ); } @@ -260,7 +260,7 @@ void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterI } // ------------------------------------------------------------------------- -void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setObjectNull", *this ); } @@ -270,9 +270,9 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons { if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index c6ab7939dc3d..468b8130571b 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -63,7 +63,7 @@ namespace connectivity //==================================================================== // our SQL statement - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; // the EBookQuery we're working with QueryData m_aQueryData; // our meta data @@ -75,7 +75,7 @@ namespace connectivity public: OEvoabPreparedStatement( OEvoabConnection* _pConnection ); - void construct( const ::rtl::OUString& _sql ); + void construct( const OUString& _sql ); protected: DECLARE_SERVICE_INFO(); @@ -93,7 +93,7 @@ namespace connectivity 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); // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - 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); + 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); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -101,7 +101,7 @@ namespace connectivity virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); 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); 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); 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); diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index f3a5ca33d552..364db8cae361 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -64,23 +64,23 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ +OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ { - return ::rtl::OUString("com.sun.star.sdbcx.evoab.ResultSet"); + return OUString("com.sun.star.sdbcx.evoab.ResultSet"); } // ------------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); return aSupported; } // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OEvoabResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) { - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); - const ::rtl::OUString* pSupported = aSupported.getConstArray(); - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); + Sequence< OUString > aSupported(getSupportedServiceNames()); + const OUString* pSupported = aSupported.getConstArray(); + const OUString* pEnd = pSupported + aSupported.getLength(); for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) ; @@ -99,12 +99,12 @@ struct ComparisonData } }; -static ::rtl::OUString +static OUString valueToOUString( GValue& _rValue ) { const char *pStr = g_value_get_string( &_rValue ); - rtl::OString aStr( pStr ? pStr : "" ); - ::rtl::OUString sResult( ::rtl::OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) ); + OString aStr( pStr ? pStr : "" ); + OUString sResult( OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) ); g_value_unset( &_rValue ); return sResult; } @@ -317,7 +317,7 @@ int CompareContacts( gconstpointer _lhs, gconstpointer _rhs, gpointer _userData bool bLhsNull = true; bool bRhsNull = true; - ::rtl::OUString sLhs, sRhs; + OUString sLhs, sRhs; bool bLhs(false), bRhs(false); const ComparisonData& rCompData = *static_cast< const ComparisonData* >( _userData ); @@ -578,7 +578,7 @@ public: if( isAuthRequired( pBook ) ) { - rtl::OString aUser( getUserName( pBook ) ); + OString aUser( getUserName( pBook ) ); const char *pAuth = e_source_get_property( pSource, "auth" ); bAuthSuccess = e_book_authenticate_user( pBook, aUser.getStr(), rPassword.getStr(), pAuth, NULL ); } @@ -693,7 +693,7 @@ void OEvoabResultSet::construct( const QueryData& _rData ) } if ( bExecuteQuery ) { - rtl::OString aPassword = m_pConnection->getPassword(); + OString aPassword = m_pConnection->getPassword(); m_pVersionHelper->executeQuery(pBook, _rData.getQuery(), aPassword); m_pConnection->setPassword( aPassword ); @@ -752,11 +752,11 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException) * If the equivalent NResultSetMetaData.cxx marks the columntype of * nColumnNum as DataType::VARCHAR this accessor is used. */ -::rtl::OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - rtl::OUString aResult; + OUString aResult; if ( m_xMetaData.is()) { OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get(); @@ -1113,7 +1113,7 @@ Any SAL_CALL OEvoabResultSet::getWarnings( ) throw(SQLException, RuntimeExcepti } // ------------------------------------------------------------------------- //XColumnLocate Interface -sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 678f123dea3c..4b8bf638d8d7 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -157,7 +157,7 @@ namespace connectivity 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); // XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -186,7 +186,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 02cf66fd43f5..889c9269eccc 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; -OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) +OEvoabResultSetMetaData::OEvoabResultSetMetaData(const OUString& _aTableName) : m_aTableName(_aTableName), m_aEvoabFields() { @@ -42,18 +42,18 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData() void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException) { OSQLColumns::Vector::const_iterator aIter; - static const ::rtl::OUString aName("Name"); + static const OUString aName("Name"); for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter) { - ::rtl::OUString aFieldName; + OUString aFieldName; (*aIter)->getPropertyValue(aName) >>= aFieldName; guint nFieldNumber = findEvoabField(aFieldName); if (nFieldNumber == (guint)-1) { connectivity::SharedResources aResource; - const ::rtl::OUString sError( aResource.getResourceStringWithSubstitution( + const OUString sError( aResource.getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", aFieldName ) ); @@ -85,49 +85,49 @@ sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnN return sal_True; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; return evoab::getFieldName( nField ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; return evoab::getFieldTypeName( nField ); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; const ColumnProperty *pSpecs = getField(nField); GParamSpec *pSpec = pSpecs->pField; - rtl::OUString aLabel; + OUString aLabel; if( pSpec ) - aLabel = rtl::OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ), + aLabel = OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ), RTL_TEXTENCODING_UTF8 ); return aLabel; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return m_aTableName;//::rtl::OUString("TABLE"); + return m_aTableName;//OUString("TABLE"); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 9ef3b859f8cd..54bef44cd470 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -36,13 +36,13 @@ namespace connectivity class OEvoabResultSetMetaData : public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; + OUString m_aTableName; ::std::vector<sal_Int32> m_aEvoabFields; protected: virtual ~OEvoabResultSetMetaData(); public: - OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName); + OEvoabResultSetMetaData(const OUString& _aTableName); void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } @@ -60,19 +60,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index e922073df08b..dc3a242fec32 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.cxx @@ -22,7 +22,6 @@ #include <osl/diagnose.h> using namespace connectivity::evoab; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 949a4e6a737e..0252794604df 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -159,12 +159,12 @@ OCommonStatement::createTrue() } EBookQuery * -OCommonStatement::createTest( const ::rtl::OUString &aColumnName, +OCommonStatement::createTest( const OUString &aColumnName, EBookQueryTest eTest, - const ::rtl::OUString &aMatch ) + const OUString &aMatch ) { - ::rtl::OString sMatch = rtl::OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 ); - ::rtl::OString sColumnName = rtl::OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 ); + OString sMatch = OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 ); + OString sColumnName = OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 ); return e_book_query_field_test( e_contact_field_id( sColumnName.getStr() ), eTest, sMatch.getStr() ); @@ -172,11 +172,11 @@ OCommonStatement::createTest( const ::rtl::OUString &aColumnName, // ------------------------------------------------------------------------- -::rtl::OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNode& _rColumnRef ) +OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNode& _rColumnRef ) { ENSURE_OR_THROW( SQL_ISRULE( &_rColumnRef, column_ref ), "internal error: only column_refs supported as LHS" ); - ::rtl::OUString sColumnName; + OUString sColumnName; switch ( _rColumnRef.count() ) { case 3: // SQL_TOKEN_NAME '.' column_val @@ -233,7 +233,7 @@ void OCommonStatement::orderByAnalysis( const OSQLParseNode* _pOrderByClause, So // column name -> column field if ( !SQL_ISRULE( pColumnRef, column_ref ) ) m_pConnection->throwGenericSQLException( STR_SORT_BY_COL_ONLY, *this ); - const ::rtl::OUString sColumnName( impl_getColumnRefColumnName_throw( *pColumnRef ) ); + const OUString sColumnName( impl_getColumnRefColumnName_throw( *pColumnRef ) ); guint nField = evoab::findEvoabField( sColumnName ); // ascending/descending? bool bAscending = true; @@ -324,9 +324,9 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) return ( nLHS == nRHS ) ? createTrue() : NULL; } - ::rtl::OUString aColumnName( impl_getColumnRefColumnName_throw( *pLHS ) ); + OUString aColumnName( impl_getColumnRefColumnName_throw( *pLHS ) ); - ::rtl::OUString aMatchString; + OUString aMatchString; if ( pRHS->isToken() ) aMatchString = pRHS->getTokenValue(); else @@ -346,7 +346,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) if( ! SQL_ISRULE( parseTree->getChild( 0 ), column_ref) ) m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_COLUMN,*this); - ::rtl::OUString aColumnName( impl_getColumnRefColumnName_throw( *parseTree->getChild( 0 ) ) ); + OUString aColumnName( impl_getColumnRefColumnName_throw( *parseTree->getChild( 0 ) ) ); OSQLParseNode *pAtom = pPart2->getChild( pPart2->count() - 2 ); // Match String bool bNotLike = pPart2->getChild(0)->isToken(); @@ -363,15 +363,15 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) const sal_Unicode WILDCARD = '%'; - rtl::OUString aMatchString; + OUString aMatchString; aMatchString = pAtom->getTokenValue(); // Determine where '%' character is... - if( aMatchString.equals( ::rtl::OUString::valueOf( WILDCARD ) ) ) + if( aMatchString.equals( OUString::valueOf( WILDCARD ) ) ) { // String containing only a '%' and nothing else matches everything pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, - rtl::OUString("") ); + OUString("") ); } else if( aMatchString.indexOf( WILDCARD ) == -1 ) { // Simple string , eg. "to match" "contains in evo" @@ -410,14 +410,14 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree ) return pResult; } -rtl::OUString OCommonStatement::getTableName() +OUString OCommonStatement::getTableName() { - ::rtl::OUString aTableName; + OUString aTableName; if( m_pParseTree && m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT ) { Any aCatalog; - ::rtl::OUString aSchema; + OUString aSchema; const OSQLParseNode *pSelectStmnt = m_aSQLIterator.getParseTree(); const OSQLParseNode *pAllTableNames = pSelectStmnt->getChild( 3 )->getChild( 0 )->getChild( 1 ); @@ -443,13 +443,13 @@ rtl::OUString OCommonStatement::getTableName() return aTableName; } -void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQueryData ) +void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData ) { SAL_INFO( "evoab2", "parsing " << sql ); _out_rQueryData.eFilterType = eFilterOther; - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree( aErr, sql ); m_aSQLIterator.setParseTree( m_pParseTree ); m_aSQLIterator.traverseAll(); @@ -461,7 +461,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer if ( pOrderByClause ) { #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sTreeDebug; + OUString sTreeDebug; pOrderByClause->showParseTree( sTreeDebug ); SAL_INFO( "evoab2", "found order-by tree:\n" << sTreeDebug ); #endif @@ -472,7 +472,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer if ( pWhereClause && SQL_ISRULE( pWhereClause, where_clause ) ) { #if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sTreeDebug; + OUString sTreeDebug; pWhereClause->showParseTree( sTreeDebug ); SAL_INFO( "evoab2", "found where tree:\n" << sTreeDebug ); #endif @@ -544,7 +544,7 @@ void SAL_CALL OCommonStatement::release() throw() } // ------------------------------------------------------------------------- -QueryData OCommonStatement::impl_getEBookQuery_throw( const ::rtl::OUString& _rSql ) +QueryData OCommonStatement::impl_getEBookQuery_throw( const OUString& _rSql ) { QueryData aData; parseSql( _rSql, aData ); @@ -580,7 +580,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryDa } // ------------------------------------------------------------------------- -Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const ::rtl::OUString& _rSql ) +Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUString& _rSql ) { SAL_INFO( "evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" ); @@ -611,7 +611,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OCommonStatement, OStatement_IBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase ) // ------------------------------------------------------------------------- -sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -621,7 +621,7 @@ sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& _sql ) throw(SQLEx } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -630,7 +630,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString } // ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 187b1fde70d6..4529aae671e1 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -75,7 +75,7 @@ namespace connectivity EBookQuery* pQuery; public: - ::rtl::OUString sTable; + OUString sTable; QueryFilterType eFilterType; ::rtl::Reference< ::connectivity::OSQLColumns > xSelectColumns; SortDescriptor aSortOrder; @@ -153,7 +153,7 @@ namespace connectivity connectivity::OSQLParseNode *m_pParseTree; // <properties> - ::rtl::OUString m_aCursorName; + OUString m_aCursorName; sal_Int32 m_nMaxFieldSize; sal_Int32 m_nMaxRows; sal_Int32 m_nQueryTimeOut; @@ -176,14 +176,14 @@ namespace connectivity virtual ~OCommonStatement(); protected: - void parseSql( const ::rtl::OUString& sql, QueryData& _out_rQueryData ); + void parseSql( const OUString& sql, QueryData& _out_rQueryData ); EBookQuery *whereAnalysis( const OSQLParseNode* parseTree ); void orderByAnalysis( const OSQLParseNode* _pOrderByClause, SortDescriptor& _out_rSort ); - rtl::OUString getTableName(); + OUString getTableName(); EBookQuery *createTrue(); - EBookQuery *createTest( const ::rtl::OUString &aColumnName, + EBookQuery *createTest( const OUString &aColumnName, EBookQueryTest eTest, - const ::rtl::OUString &aMatch ); + const OUString &aMatch ); public: @@ -221,10 +221,10 @@ namespace connectivity Also, all statement dependent members (such as the parser/iterator) will be inited afterwards. */ QueryData - impl_getEBookQuery_throw( const ::rtl::OUString& _rSql ); + impl_getEBookQuery_throw( const OUString& _rSql ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > - impl_executeQuery_throw( const ::rtl::OUString& _rSql ); + impl_executeQuery_throw( const OUString& _rSql ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_executeQuery_throw( const QueryData& _rData ); @@ -232,7 +232,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > impl_getConnection() { return ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >( (::com::sun::star::sdbc::XConnection*)m_pConnection ); } - ::rtl::OUString + OUString impl_getColumnRefColumnName_throw( const ::connectivity::OSQLParseNode& _rColumnRef ); }; @@ -263,9 +263,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + 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) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; }; } diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 2d7481413ed8..4b13fa3f8539 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -35,11 +35,11 @@ using namespace connectivity::evoab; // ------------------------------------------------------------------------- OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description , - const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName + const OUString& _Name, + const OUString& _Type, + const OUString& _Description , + const OUString& _SchemaName, + const OUString& _CatalogName ) : OEvoabTable_TYPEDEF(_pTables,sal_True, _Name, _Type, @@ -61,7 +61,7 @@ void OEvoabTable::refreshColumns() Any(), m_SchemaName, m_Name, - ::rtl::OUString("%")); + OUString("%")); if (xResult.is()) { diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx index 4ce421c87bbf..e1b22f1c7df2 100644 --- a/connectivity/source/drivers/evoab2/NTable.hxx +++ b/connectivity/source/drivers/evoab2/NTable.hxx @@ -29,7 +29,7 @@ namespace connectivity { typedef connectivity::sdbcx::OTable OEvoabTable_TYPEDEF; - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OEvoabTable : public OEvoabTable_TYPEDEF { @@ -39,19 +39,19 @@ namespace connectivity public: OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, - const ::rtl::OUString& _Name, - const ::rtl::OUString& _Type, - const ::rtl::OUString& _Description = ::rtl::OUString(), - const ::rtl::OUString& _SchemaName = ::rtl::OUString(), - const ::rtl::OUString& _CatalogName = ::rtl::OUString() + const OUString& _Name, + const OUString& _Type, + const OUString& _Description = OUString(), + const OUString& _SchemaName = OUString(), + const OUString& _CatalogName = OUString() ); OEvoabConnection* getConnection() { return m_pConnection;} virtual void refreshColumns(); - ::rtl::OUString getTableName() const { return m_Name; } - ::rtl::OUString getSchema() const { return m_SchemaName; } + OUString getTableName() const { return m_Name; } + OUString getSchema() const { return m_SchemaName; } }; } } diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index a0f2fa5fcacb..c756cb6dfdcb 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -45,13 +45,13 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace dbtools; -ObjectType OEvoabTables::createObject(const ::rtl::OUString& aName) +ObjectType OEvoabTables::createObject(const OUString& aName) { - ::rtl::OUString aSchema( "%" ); + OUString aSchema( "%" ); - Sequence< ::rtl::OUString > aTypes(1); - aTypes[0] = ::rtl::OUString("TABLE"); - ::rtl::OUString sEmpty; + Sequence< OUString > aTypes(1); + aTypes[0] = OUString("TABLE"); + OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 3827182abed4..caced2a8d23f 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -29,7 +29,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; protected: - virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: OEvoabTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData, |