diff options
Diffstat (limited to 'connectivity/source/drivers/file')
17 files changed, 222 insertions, 223 deletions
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index b7173ef703f6..58d122cdddeb 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -49,7 +49,7 @@ m_xMetaData.clear(); OFileCatalog_BASE::disposing(); } // ----------------------------------------------------------------------------- -::rtl::OUString OFileCatalog::buildName(const Reference< XRow >& _xRow) +OUString OFileCatalog::buildName(const Reference< XRow >& _xRow) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileCatalog::buildName" ); return _xRow->getString(3); @@ -59,9 +59,9 @@ void OFileCatalog::refreshTables() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileCatalog::refreshTables" ); TStringVector aVector; - Sequence< ::rtl::OUString > aTypes; + Sequence< OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString("%"),::rtl::OUString("%"),aTypes); + OUString("%"),OUString("%"),aTypes); fillNames(xResult,aVector); if(m_pTables) diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index 199c0acda4d3..c134c14ce162 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -35,12 +35,12 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { const Any aCatalog; - const ::rtl::OUString sCatalogName; - const ::rtl::OUString sSchemaName(m_pTable->getSchema()); - const ::rtl::OUString sTableName(m_pTable->getName()); + const OUString sCatalogName; + const OUString sSchemaName(m_pTable->getSchema()); + const OUString sTableName(m_pTable->getName()); Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(), sSchemaName, sTableName, _rName); diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 0683af96b69a..447a6dc435e3 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star::sdbcx; using namespace com::sun::star::container; using namespace com::sun::star::ucb; using namespace ::ucbhelper; -using rtl::OUString; typedef connectivity::OMetaConnection OConnection_BASE; // -------------------------------------------------------------------------------- OConnection::OConnection(OFileDriver* _pDriver) @@ -94,11 +93,11 @@ sal_Bool OConnection::matchesExtension( const String& _rExt ) const } //----------------------------------------------------------------------------- -void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { osl_atomic_increment( &m_refCount ); - ::rtl::OUString aExt; + OUString aExt; const PropertyValue *pIter = info.getConstArray(); const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) @@ -107,7 +106,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV OSL_VERIFY( pIter->Value >>= aExt ); else if(0 == pIter->Name.compareToAscii("CharSet")) { - ::rtl::OUString sIanaName; + OUString sIanaName; OSL_VERIFY( pIter->Value >>= sIanaName ); ::dbtools::OCharsetMap aLookupIanaName; @@ -130,7 +129,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV { sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - ::rtl::OUString aDSN(url.copy(nLen+1)); + OUString aDSN(url.copy(nLen+1)); String aFileName = aDSN; INetURLObject aURL; @@ -199,7 +198,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV throwUrlNotValid(getURL(),e.Message); } if(!m_xDir.is() || !m_xContent.is()) - throwUrlNotValid(getURL(),::rtl::OUString()); + throwUrlNotValid(getURL(),OUString()); if (m_aFilenameExtension.Search('*') != STRING_NOTFOUND || m_aFilenameExtension.Search('?') != STRING_NOTFOUND) throw SQLException(); @@ -228,7 +227,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -241,13 +240,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: return pStmt; } // -------------------------------------------------------------------------------- -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { return sql; } @@ -317,14 +316,14 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_bReadOnly; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } // -------------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { - return ::rtl::OUString(); + return OUString(); } // -------------------------------------------------------------------------------- void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) @@ -395,9 +394,9 @@ Reference< XTablesSupplier > OConnection::createCatalog() Reference< XDynamicResultSet > OConnection::getDir() const { Reference<XDynamicResultSet> xContent; - Sequence< ::rtl::OUString > aProps(1); - ::rtl::OUString* pProps = aProps.getArray(); - pProps[ 0 ] = ::rtl::OUString("Title"); + Sequence< OUString > aProps(1); + OUString* pProps = aProps.getArray(); + pProps[ 0 ] = OUString("Title"); try { Reference<XContentIdentifier> xIdent = getContent()->getIdentifier(); @@ -432,7 +431,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId() return pId->getImplementationId(); } // ----------------------------------------------------------------------------- -void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::OUString & _rsMessage) +void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsMessage) { SQLException aError; aError.Message = getResources().getResourceStringWithSubstitution( @@ -440,11 +439,11 @@ void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::O "$URL$", _rsUrl ); - aError.SQLState = ::rtl::OUString("S1000"); + aError.SQLState = OUString("S1000"); aError.ErrorCode = 0; aError.Context = static_cast< XConnection* >(this); if (!_rsMessage.isEmpty()) - aError.NextException <<= SQLException(_rsMessage, aError.Context, ::rtl::OUString(), 0, Any()); + aError.NextException <<= SQLException(_rsMessage, aError.Context, OUString(), 0, Any()); throw aError; } diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 1bd1a49a2f5a..9448cac04089 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -65,15 +65,15 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTypeInfo ); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) +OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getCatalogSeparator_throw" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::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) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getColumns" ); OSL_FAIL("Should be overloaded!"); @@ -165,8 +165,8 @@ namespace // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::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) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTables" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -178,7 +178,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( // check if any type is given // when no types are given then we have to return all tables e.g. TABLE - static const ::rtl::OUString aTable("TABLE"); + static const OUString aTable("TABLE"); sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); @@ -186,8 +186,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::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) @@ -220,7 +220,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( String sThisContentExtension; ODatabaseMetaDataResultSet::ORows aRows; // scan the directory for tables - ::rtl::OUString aName; + OUString aName; INetURLObject aURL; xResultSet->beforeFirst(); @@ -232,7 +232,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( { aName = xRow->getString(1); aURL.SetSmartProtocol(INET_PROT_FILE); - String sUrl = m_pConnection->getURL() + ::rtl::OUString("/") + aName; + String sUrl = m_pConnection->getURL() + OUString("/") + aName; aURL.SetSmartURL( sUrl ); sThisContentExtension = aURL.getExtension(); @@ -270,7 +270,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( if ( sThisContentExtension == aFilenameExtension ) { - aName = aName.replaceAt(aName.getLength()-(aFilenameExtension.Len()+1),aFilenameExtension.Len()+1,::rtl::OUString()); + aName = aName.replaceAt(aName.getLength()-(aFilenameExtension.Len()+1),aFilenameExtension.Len()+1,OUString()); sal_Unicode nChar = aName.toChar(); if ( match(tableNamePattern,aName,'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { @@ -289,7 +289,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( sal_Unicode nChar = aURL.getBase().getStr()[0]; if(match(tableNamePattern,aURL.getBase(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) ) { - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(aURL.getBase()))); + aRow.push_back(new ORowSetValueDecorator(OUString(aURL.getBase()))); bNewRow = sal_True; } break; @@ -388,7 +388,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTablePrivileges" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -402,9 +402,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( if( xTabSup.is()) { Reference< XNameAccess> xNames = xTabSup->getTables(); - Sequence< ::rtl::OUString > aNames = xNames->getElementNames(); - const ::rtl::OUString* pBegin = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); + Sequence< OUString > aNames = xNames->getElementNames(); + const OUString* pBegin = aNames.getConstArray(); + const OUString* pEnd = pBegin + aNames.getLength(); for(;pBegin != pEnd;++pBegin) { if(match(tableNamePattern,*pBegin,'\0')) @@ -413,7 +413,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( aRow[2] = new ORowSetValueDecorator(*pBegin); aRow[6] = ODatabaseMetaDataResultSet::getSelectValue(); - aRow[7] = new ORowSetValueDecorator(::rtl::OUString("NO")); + aRow[7] = new ORowSetValueDecorator(OUString("NO")); aRows.push_back(aRow); Reference< XPropertySet> xTable; @@ -523,23 +523,23 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getCatalogTerm" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getIdentifierQuoteString_throw" ); - static const ::rtl::OUString sQuote("\""); + static const OUString sQuote("\""); return sQuote; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getExtraNameCharacters" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) @@ -692,7 +692,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE { ODatabaseMetaDataResultSet::ORow aRow; aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("TABLE"))); + aRow.push_back(new ORowSetValueDecorator(OUString("TABLE"))); aRows.push_back(aRow); } pResult->setRows(aRows); @@ -951,53 +951,53 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQL return sal_False; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getURL" ); - static const ::rtl::OUString aValue( "sdbc:file:" ); + static const OUString aValue( "sdbc:file:" ); return aValue; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getUserName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDriverName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDriverVersion" ); - return ::rtl::OUString::valueOf((sal_Int32)1); + return OUString::valueOf((sal_Int32)1); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDatabaseProductVersion" ); - return ::rtl::OUString::valueOf((sal_Int32)0); + return OUString::valueOf((sal_Int32)0); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDatabaseProductName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getProcedureTerm" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSchemaTerm" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) @@ -1018,40 +1018,40 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc return 0; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSQLKeywords" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSearchStringEscape" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getStringFunctions" ); - return ::rtl::OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT"); + return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT"); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTimeDateFunctions" ); - return ::rtl::OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW"); + return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW"); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSystemFunctions" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getNumericFunctions" ); - return ::rtl::OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS"); + return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS"); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) @@ -1196,7 +1196,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException return sal_False; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getUDTs" ); return NULL; diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index 925cd763c47c..03256f7ab7cc 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -97,32 +97,32 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet; + OUString sRet; ::com::sun::star::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); DayOfWeek eDayOfWeek = aDate.GetDayOfWeek(); switch(eDayOfWeek) { case MONDAY: - sRet = ::rtl::OUString("Monday"); + sRet = OUString("Monday"); break; case TUESDAY: - sRet = ::rtl::OUString("Tuesday"); + sRet = OUString("Tuesday"); break; case WEDNESDAY: - sRet = ::rtl::OUString("Wednesday"); + sRet = OUString("Wednesday"); break; case THURSDAY: - sRet = ::rtl::OUString("Thursday"); + sRet = OUString("Thursday"); break; case FRIDAY: - sRet = ::rtl::OUString("Friday"); + sRet = OUString("Friday"); break; case SATURDAY: - sRet = ::rtl::OUString("Saturday"); + sRet = OUString("Saturday"); break; case SUNDAY: - sRet = ::rtl::OUString("Sunday"); + sRet = OUString("Sunday"); break; default: OSL_FAIL("Error in enum values for date"); @@ -135,45 +135,45 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet; + OUString sRet; ::com::sun::star::util::Date aD = lhs; switch(aD.Month) { case 1: - sRet = ::rtl::OUString("January"); + sRet = OUString("January"); break; case 2: - sRet = ::rtl::OUString("February"); + sRet = OUString("February"); break; case 3: - sRet = ::rtl::OUString("March"); + sRet = OUString("March"); break; case 4: - sRet = ::rtl::OUString("April"); + sRet = OUString("April"); break; case 5: - sRet = ::rtl::OUString("May"); + sRet = OUString("May"); break; case 6: - sRet = ::rtl::OUString("June"); + sRet = OUString("June"); break; case 7: - sRet = ::rtl::OUString("July"); + sRet = OUString("July"); break; case 8: - sRet = ::rtl::OUString("August"); + sRet = OUString("August"); break; case 9: - sRet = ::rtl::OUString("September"); + sRet = OUString("September"); break; case 10: - sRet = ::rtl::OUString("October"); + sRet = OUString("October"); break; case 11: - sRet = ::rtl::OUString("November"); + sRet = OUString("November"); break; case 12: - sRet = ::rtl::OUString("December"); + sRet = OUString("December"); break; } return sRet; diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 21a0d9dda5ec..79912f3ed308 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -62,31 +62,31 @@ void OFileDriver::disposing() // static ServiceInfo //------------------------------------------------------------------------------ -rtl::OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdbc.driver.file.Driver"); + return OUString("com.sun.star.sdbc.driver.file.Driver"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver"); - aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver"); + Sequence< OUString > aSNS( 2 ); + aSNS[0] = OUString("com.sun.star.sdbc.Driver"); + aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); return aSNS; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ -sal_Bool SAL_CALL OFileDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OFileDriver::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) ; @@ -94,13 +94,13 @@ sal_Bool SAL_CALL OFileDriver::supportsService( const ::rtl::OUString& _rService } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } // -------------------------------------------------------------------------------- -Reference< XConnection > SAL_CALL OFileDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::connect" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -114,71 +114,71 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const ::rtl::OUString& u return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL OFileDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::acceptsURL" ); return url.startsWith("sdbc:file:"); } // -------------------------------------------------------------------------------- -Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::getPropertyInfo" ); if ( acceptsURL(url) ) { ::std::vector< DriverPropertyInfo > aDriverInfo; - Sequence< ::rtl::OUString > aBoolean(2); - aBoolean[0] = ::rtl::OUString("0"); - aBoolean[1] = ::rtl::OUString("1"); + Sequence< OUString > aBoolean(2); + aBoolean[0] = OUString("0"); + aBoolean[1] = OUString("1"); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("CharSet") - ,::rtl::OUString("CharSet of the database.") + OUString("CharSet") + ,OUString("CharSet of the database.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("Extension") - ,::rtl::OUString("Extension of the file format.") + OUString("Extension") + ,OUString("Extension of the file format.") ,sal_False - ,::rtl::OUString(".*") - ,Sequence< ::rtl::OUString >()) + ,OUString(".*") + ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("ShowDeleted") - ,::rtl::OUString("Display inactive records.") + OUString("ShowDeleted") + ,OUString("Display inactive records.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("EnableSQL92Check") - ,::rtl::OUString("Use SQL92 naming constraints.") + OUString("EnableSQL92Check") + ,OUString("Use SQL92 naming constraints.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("UseRelativePath") - ,::rtl::OUString("Handle the connection url as relative path.") + OUString("UseRelativePath") + ,OUString("Handle the connection url as relative path.") ,sal_False - ,::rtl::OUString("0") + ,OUString("0") ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - ::rtl::OUString("URL") - ,::rtl::OUString("The URL of the database document which is used to create an absolute path.") + OUString("URL") + ,OUString("The URL of the database document which is used to create an absolute path.") ,sal_False - ,::rtl::OUString() - ,Sequence< ::rtl::OUString >()) + ,OUString() + ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); } // 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) ) return Sequence< DriverPropertyInfo >(); @@ -226,13 +226,13 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection } // -------------------------------------------------------------------------------- -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::getDataDefinitionByURL" ); 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); } return getDataDefinitionByConnection(connect(url,info)); diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 37307f6dd7ae..f63d4e0cfc86 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -95,7 +95,7 @@ void OPreparedStatement::disposing() } // ------------------------------------------------------------------------- -void OPreparedStatement::construct(const ::rtl::OUString& sql) throw(SQLException, RuntimeException) +void OPreparedStatement::construct(const OUString& sql) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::construct" ); OStatement_Base::construct(sql); @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setString" ); setParameter(parameterIndex,x); @@ -337,7 +337,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } // ------------------------------------------------------------------------- -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setObjectNull" ); setNull(parameterIndex,sqlType); @@ -349,9 +349,9 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setObject" ); if(!::dbtools::implSetObject(this,parameterIndex,x)) { - const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution( STR_UNKNOWN_PARA_TYPE, - "$position$", ::rtl::OUString::valueOf(parameterIndex) + "$position$", OUString::valueOf(parameterIndex) ) ); ::dbtools::throwGenericSQLException(sError,*this); } @@ -477,7 +477,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re OSL_UNUSED( pMark ); #endif - ::rtl::OUString sParameterName; + OUString sParameterName; // set up Parameter-Column: sal_Int32 eType = DataType::VARCHAR; sal_uInt32 nPrecision = 255; @@ -497,9 +497,9 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re } Reference<XPropertySet> xParaColumn = new connectivity::parse::OParseColumn(sParameterName - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString() + ,OUString() + ,OUString() + ,OUString() ,nNullable ,nPrecision ,nScale @@ -507,9 +507,9 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re ,sal_False ,sal_False ,m_aSQLIterator.isCaseSensitive() - ,::rtl::OUString() - ,::rtl::OUString() - ,::rtl::OUString()); + ,OUString() + ,OUString() + ,OUString()); m_xParamColumns->get().push_back(xParaColumn); return m_xParamColumns->get().size(); } @@ -520,7 +520,7 @@ void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode Reference<XPropertySet> xProp; if(SQL_ISRULE(_pNode,column_ref)) { - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; m_aSQLIterator.getColumnRange(_pNode,sColumnName,sTableRange); if ( !sColumnName.isEmpty() ) { diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 9e00758c66b6..14b195c056da 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -68,7 +68,7 @@ namespace void lcl_throwError(sal_uInt16 _nErrorId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext) { ::connectivity::SharedResources aResources; - const ::rtl::OUString sMessage = aResources.getResourceString(_nErrorId); + const OUString sMessage = aResources.getResourceString(_nErrorId); ::dbtools::throwGenericSQLException(sMessage ,_xContext); } } @@ -203,7 +203,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException) } // ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::findColumn" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -375,7 +375,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept return getValue(columnIndex); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::getString" ); return getValue(columnIndex); @@ -795,7 +795,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw( updateValue(columnIndex,x); } // ------------------------------------------------------------------------- -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::updateString" ); updateValue(columnIndex,x); @@ -1634,11 +1634,11 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); Reference<XPropertySet> xTableColumn; - ::rtl::OUString sTableColumnName, sSelectColumnRealName; + OUString sTableColumnName, sSelectColumnRealName; - const ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); - const ::rtl::OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); + const OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); + const OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); typedef ::std::map<OSQLColumns::Vector::iterator,sal_Bool> IterMap; IterMap aSelectIters; @@ -1657,7 +1657,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, if (xTableColumn.is()) xTableColumn->getPropertyValue(sName) >>= sTableColumnName; else - sTableColumnName = ::rtl::OUString(); + sTableColumnName = OUString(); // look if we have such a select column // TODO: would like to have a O(log n) search here ... @@ -1703,7 +1703,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, if ( _bSetColumnMapping && aSelectIters.size() != _rColMapping.size() ) { Reference<XNameAccess> xNameAccess(_xNames,UNO_QUERY); - Sequence< ::rtl::OUString > aSelectColumns = xNameAccess->getElementNames(); + Sequence< OUString > aSelectColumns = xNameAccess->getElementNames(); for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); aIter != _rxColumns->get().end(); @@ -1721,8 +1721,8 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, { aSelectIters.insert(IterMap::value_type(aIter,sal_True)); sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; - const ::rtl::OUString* pBegin = aSelectColumns.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aSelectColumns.getLength(); + const OUString* pBegin = aSelectColumns.getConstArray(); + const OUString* pEnd = pBegin + aSelectColumns.getLength(); for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) { if ( aCase(*pBegin, sSelectColumnRealName) ) diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index 42a1a2def4ee..8b015ed8bbda 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable) +OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const OUString& _aTableName,OFileTable* _pTable) :m_aTableName(_aTableName) ,m_xColumns(_rxColumns) ,m_pTable(_pTable) @@ -86,14 +86,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getSchemaName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnName" ); checkColumnIndex(column); @@ -102,35 +102,35 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getTableName" ); return m_aTableName; } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getCatalogName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnTypeName" ); checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnLabel" ); return getColumnName(column); } // ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnServiceName" ); - return ::rtl::OUString(); + return OUString(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 7d247247b7c7..af620b2875b2 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -82,7 +82,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) sal_Int32 nAttrib = 0; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< OUString*>(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(static_cast<sal_Int32*>(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(0))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast<sal_Int32*>(0))); @@ -284,7 +284,7 @@ void SAL_CALL OStatement::release() throw() } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- -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 ); @@ -295,7 +295,7 @@ sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& sql ) throw(SQLExc // ------------------------------------------------------------------------- -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(OStatement_BASE::rBHelper.bDisposed); @@ -317,7 +317,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLExcepti return (Reference< XConnection >)m_pConnection; } // ------------------------------------------------------------------------- -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(OStatement_BASE::rBHelper.bDisposed); @@ -398,7 +398,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::setOrderbyColumn" ); - ::rtl::OUString aColumnName; + OUString aColumnName; if (pColumnRef->count() == 1) aColumnName = pColumnRef->getChild(0)->getTokenValue(); else if (pColumnRef->count() == 3) @@ -427,10 +427,10 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, } // ----------------------------------------------------------------------------- -void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, RuntimeException) +void OStatement_Base::construct(const OUString& sql) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::construct" ); - ::rtl::OUString aErr; + OUString aErr; m_pParseTree = m_aParser.parseTree(aErr,sql); if(m_pParseTree) { @@ -503,7 +503,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, anylizeSQL(); } else - throw SQLException(aErr,*this,::rtl::OUString(),0,Any()); + throw SQLException(aErr,*this,OUString(),0,Any()); } // ----------------------------------------------------------------------------- void OStatement_Base::createColumnMapping() @@ -573,9 +573,9 @@ void OStatement_Base::GetAssignValues() OSL_ENSURE(SQL_ISRULE(pOptColumnCommalist,opt_column_commalist),"OResultSet: Fehler im Parse Tree"); if (pOptColumnCommalist->count() == 0) { - const Sequence< ::rtl::OUString>& aNames = m_xColNames->getElementNames(); - const ::rtl::OUString* pBegin = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); + const Sequence< OUString>& aNames = m_xColNames->getElementNames(); + const OUString* pBegin = aNames.getConstArray(); + const OUString* pEnd = pBegin + aNames.getLength(); for (; pBegin != pEnd; ++pBegin) aColumnNameList.push_back(*pBegin); } diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx index e5283967814c..eb3e5c915c30 100644 --- a/connectivity/source/drivers/file/FStringFunctions.cxx +++ b/connectivity/source/drivers/file/FStringFunctions.cxx @@ -48,7 +48,7 @@ ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_Ascii::operate" ); if ( lhs.isNull() ) return lhs; - ::rtl::OString sStr(::rtl::OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US)); + OString sStr(OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US)); sal_Int32 nAscii = sStr.toChar(); return nAscii; } @@ -68,7 +68,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const if ( lhs.empty() ) return ORowSetValue(); - ::rtl::OUString sRet; + OUString sRet; ::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin(); ::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend(); for (; aIter != aEnd; ++aIter) @@ -77,7 +77,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const { sal_Char c = static_cast<sal_Char>(static_cast<sal_Int32>(*aIter)); - sRet += ::rtl::OUString(&c,1,RTL_TEXTENCODING_ASCII_US); + sRet += OUString(&c,1,RTL_TEXTENCODING_ASCII_US); } } @@ -90,7 +90,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const if ( lhs.empty() ) return ORowSetValue(); - ::rtl::OUStringBuffer sRet; + OUStringBuffer sRet; ::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin(); ::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend(); for (; aIter != aEnd; ++aIter) @@ -98,7 +98,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const if ( aIter->isNull() ) return ORowSetValue(); - sRet.append(aIter->operator ::rtl::OUString()); + sRet.append(aIter->operator OUString()); } return sRet.makeStringAndClear(); @@ -115,7 +115,7 @@ ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const return ORowSetValue(); } if ( lhs.size() == 2 ) - return ::rtl::OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1); + return OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1); else if ( lhs.size() != 3 ) return ORowSetValue(); @@ -148,8 +148,8 @@ ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet = lhs; - ::rtl::OUString sNew = sRet.trim(); + OUString sRet = lhs; + OUString sNew = sRet.trim(); return sRet.copy(sRet.indexOf(sNew)); } //------------------------------------------------------------------ @@ -159,8 +159,8 @@ ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const if ( lhs.isNull() ) return lhs; - ::rtl::OUString sRet = lhs; - ::rtl::OUString sNew = sRet.trim(); + OUString sRet = lhs; + OUString sNew = sRet.trim(); return sRet.copy(0,sRet.lastIndexOf(sNew.getStr()[sNew.getLength()-1])+1); } //------------------------------------------------------------------ @@ -171,7 +171,7 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const return lhs; const sal_Char c = ' '; - ::rtl::OUStringBuffer sRet; + OUStringBuffer sRet; sal_Int32 nCount = lhs; for (sal_Int32 i=0; i < nCount; ++i) { @@ -186,9 +186,9 @@ ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const if ( lhs.size() != 3 ) return ORowSetValue(); - ::rtl::OUString sStr = lhs[2]; - ::rtl::OUString sFrom = lhs[1]; - ::rtl::OUString sTo = lhs[0]; + OUString sStr = lhs[2]; + OUString sFrom = lhs[1]; + OUString sTo = lhs[0]; sal_Int32 nIndexOf = sStr.indexOf(sFrom); while( nIndexOf != -1 ) { @@ -205,7 +205,7 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs if ( lhs.isNull() || rhs.isNull() ) return lhs; - ::rtl::OUString sRet; + OUString sRet; sal_Int32 nCount = rhs; for (sal_Int32 i=0; i < nCount; ++i) { @@ -220,7 +220,7 @@ ORowSetValue OOp_Insert::operate(const ::std::vector<ORowSetValue>& lhs) const if ( lhs.size() != 4 ) return ORowSetValue(); - ::rtl::OUString sStr = lhs[3]; + OUString sStr = lhs[3]; sal_Int32 nStart = static_cast<sal_Int32>(lhs[2]); if ( nStart < 1 ) @@ -234,7 +234,7 @@ ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) if ( lhs.isNull() || rhs.isNull() ) return lhs; - ::rtl::OUString sRet = lhs; + OUString sRet = lhs; sal_Int32 nCount = rhs; if ( nCount < 0 ) return ORowSetValue(); @@ -248,7 +248,7 @@ ORowSetValue OOp_Right::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) return lhs; sal_Int32 nCount = rhs; - ::rtl::OUString sRet = lhs; + OUString sRet = lhs; if ( nCount < 0 || nCount >= sRet.getLength() ) return ORowSetValue(); diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 8dc2c7106544..3350d8babe92 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -55,11 +55,11 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection) } // ------------------------------------------------------------------------- OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _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 ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _Name, _Type, @@ -90,7 +90,7 @@ void OFileTable::refreshColumns() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::refreshColumns" ); TStringVector aVector; Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(Any(), - m_SchemaName,m_Name,::rtl::OUString("%")); + m_SchemaName,m_Name,OUString("%")); if(xResult.is()) { diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index 78ff160ad042..cba822e2bb0f 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& /*_rName*/) +sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/) { return sdbcx::ObjectType(); } diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 5ef103f04202..d125c1eb5c9b 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -106,7 +106,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode) { // push one element for each column of our table const Reference< XNameAccess > xColumnNames( m_aCompiler->getOrigColumns() ); - const Sequence< ::rtl::OUString > aColumnNames( xColumnNames->getElementNames() ); + const Sequence< OUString > aColumnNames( xColumnNames->getElementNames() ); for ( sal_Int32 j=0; j<aColumnNames.getLength(); ++j ) m_aSelectionEvaluations.push_back( TPredicates() ); } diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 1712d5a00918..894f31d29436 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -154,7 +154,7 @@ const ORowSetValue& OOperandValue::getValue() const } //------------------------------------------------------------------ -OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const rtl::OUString& aStrValue) +OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aStrValue) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandConst::OOperandConst" ); switch (rColumnRef.getNodeType()) @@ -336,7 +336,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con case DataType::VARCHAR: case DataType::LONGVARCHAR: { - rtl::OUString sLH = aLH, sRH = aRH; + OUString sLH = aLH, sRH = aRH; sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength ( sLH.pData->buffer, diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 5419402bf76e..5b395aebcbe2 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -428,7 +428,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr if (SQL_ISRULE(pPredicateNode,column_ref)) { - ::rtl::OUString aColumnName; + OUString aColumnName; if (pPredicateNode->count() == 1) { aColumnName = pPredicateNode->getChild(0)->getTokenValue(); @@ -443,7 +443,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr if(!m_orgColumns->hasByName(aColumnName)) { - const ::rtl::OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", aColumnName ) ); @@ -458,7 +458,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr } else {// Column doesn't exist in the Result-set - const ::rtl::OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( + const OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", aColumnName ) ); @@ -488,7 +488,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr (SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) && pPredicateNode->getChild(1)->getNodeType() == SQL_NODE_INTNUM) { // if -1 or +1 is there - ::rtl::OUString aValue(pPredicateNode->getChild(0)->getTokenValue()); + OUString aValue(pPredicateNode->getChild(0)->getTokenValue()); aValue += pPredicateNode->getChild(1)->getTokenValue(); pOperand = new OOperandConst(*pPredicateNode->getChild(1), aValue); } @@ -503,7 +503,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr SQL_ISTOKEN(pODBCNodeChild,T) || SQL_ISTOKEN(pODBCNodeChild,TS) )) { - ::rtl::OUString sDateTime = pODBCNode->getChild(1)->getTokenValue(); + OUString sDateTime = pODBCNode->getChild(1)->getTokenValue(); pOperand = new OOperandConst(*pODBCNode->getChild(1), sDateTime); if(SQL_ISTOKEN(pODBCNodeChild,D)) { diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx index b8d9c6bc03f2..2d199e0a9186 100644 --- a/connectivity/source/drivers/file/quotedstring.cxx +++ b/connectivity/source/drivers/file/quotedstring.cxx @@ -79,7 +79,7 @@ namespace connectivity } } } - //OSL_TRACE("QuotedTokenizedString::nTokCount = %d\n", ((OUtoCStr(::rtl::OUString(nTokCount))) ? (OUtoCStr(::rtl::OUString(nTokCount))):("NULL")) ); + //OSL_TRACE("QuotedTokenizedString::nTokCount = %d\n", ((OUtoCStr(OUString(nTokCount))) ? (OUtoCStr(OUString(nTokCount))):("NULL")) ); return nTokCount; } |