diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 11:23:45 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 11:23:45 +0100 |
commit | 88fa511a7748ff920546bd28ac9e15f5e0ba2fb0 (patch) | |
tree | 4555e53c8209dbeb038221ab142cbb9c445b1330 /connectivity | |
parent | d1041919f51c597b5c098ca716f141e494c22c49 (diff) |
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/commontools/dbtools2.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/adabas/BColumns.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/adabas/BUser.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/evoab2/NConnection.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/evoab2/NDriver.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/hsqldb/HConnection.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/hsqldb/HDriver.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/mozab/MConnection.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/mysql/YDriver.cxx | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index fd94914257aa..21b17eeec624 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -821,7 +821,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc const PropertyValue* pEnd = pIter + aArgs.getLength(); for(;pIter != pEnd;++pIter) { - if ( pIter->Name.equalsAscii("ComponentData") ) + if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ComponentData")) ) { Sequence<PropertyValue> aDocumentContext; pIter->Value >>= aDocumentContext; @@ -829,7 +829,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc const PropertyValue* pContextEnd = pContextIter + aDocumentContext.getLength(); for(;pContextIter != pContextEnd;++pContextIter) { - if ( pContextIter->Name.equalsAscii( "ActiveConnection" ) + if ( pContextIter->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ActiveConnection" ) ) && ( pContextIter->Value >>= _rxActualConnection ) ) { diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx index 6fa88353d593..3968154d584a 100644 --- a/connectivity/source/drivers/adabas/BColumns.cxx +++ b/connectivity/source/drivers/adabas/BColumns.cxx @@ -74,7 +74,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) sal_Int32 nPrec = xRow->getInt(7); OAdabasCatalog::correctColumnProperties(nPrec,nType,sTypeName); sal_Bool bAutoIncrement = sal_False; - if ( !_rName.equalsAscii("DEFAULT") && !m_pTable->getSchema().equalsAscii("DOMAIN") && !m_pTable->getTableName().equalsAscii("COLUMNS") ) + if ( !_rName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DEFAULT")) && !m_pTable->getSchema().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DOMAIN")) && !m_pTable->getTableName().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("COLUMNS")) ) { Reference< XStatement > xStmt = m_pTable->getMetaData()->getConnection()->createStatement( ); ::rtl::OUString sQuery(RTL_CONSTASCII_USTRINGPARAM("SELECT \"DEFAULT\" FROM DOMAIN.COLUMNS WHERE OWNER = '")); diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx index ff54d5f936b4..42b72be0138d 100644 --- a/connectivity/source/drivers/adabas/BUser.cxx +++ b/connectivity/source/drivers/adabas/BUser.cxx @@ -171,7 +171,7 @@ void OAdabasUser::getAnyTablePrivileges(const ::rtl::OUString& objName, sal_Int3 continue; nRights |= privileges[i].nNumericValue; - if ( sPrivs.copy( nIndex + 2, 1 ).equalsAscii( "+" ) ) + if ( sPrivs.copy( nIndex + 2, 1 ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "+" ) ) ) nRightsWithGrant |= privileges[i].nNumericValue; } } diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 2e6a55439f76..f1dc29c9a222 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -125,9 +125,9 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro } } - if (url.equalsAscii("sdbc:address:evolution:groupwise")) + if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise"))) setSDBCAddressType(SDBCAddress::EVO_GWISE); - else if (url.equalsAscii("sdbc:address:evolution:ldap")) + else if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap"))) setSDBCAddressType(SDBCAddress::EVO_LDAP); else setSDBCAddressType(SDBCAddress::EVO_LOCAL); diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index dd9e035142a2..855f0be63242 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -182,7 +182,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException) // -------------------------------------------------------------------------------- sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url ) { - return (url.equalsAscii("sdbc:address:evolution:local") || url.equalsAscii("sdbc:address:evolution:groupwise")||url.equalsAscii("sdbc:address:evolution:ldap"))&& EApiInit(); + return (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:local")) || url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise"))||url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap")))&& EApiInit(); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 951d3f745dad..3f4ca4baea93 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -335,7 +335,7 @@ namespace connectivity { namespace hsqldb { Reference< XRow > xValueAccess( xTableHsqlType, UNO_QUERY_THROW ); ::rtl::OUString sTableType = xValueAccess->getString( 1 ); - bIsTextTable = sTableType.equalsAscii( "TEXT" ); + bIsTextTable = sTableType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TEXT" ) ); } } catch( const Exception& ) diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index ac53b47a4f9a..215f3990fe2c 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -190,11 +190,11 @@ namespace connectivity for (;pIter != pEnd; ++pIter) { - if ( pIter->Name.equalsAscii("Storage") ) + if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Storage")) ) { xStorage.set(pIter->Value,UNO_QUERY); } - else if ( pIter->Name.equalsAscii("URL") ) + else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) ) { pIter->Value >>= sURL; } diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 9a36f943ff2c..df121ffeacce 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -159,7 +159,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV // sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); - OSL_ENSURE( url.copy( 0, nLen ).equalsAscii( "sdbc:address" ), "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); + OSL_ENSURE( url.copy( 0, nLen ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "sdbc:address" ) ), "OConnection::construct: invalid start of the URI - should never have survived XDriver::acceptsURL!" ); ::rtl::OUString aAddrbookURI(url.copy(nLen+1)); // Get Scheme diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 2d8e70e8e56c..aef756916ec6 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -108,7 +108,7 @@ namespace connectivity { sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl) { - return _sUrl.copy(0,16).equalsAscii("sdbc:mysql:odbc:"); + return _sUrl.copy(0,16).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:mysql:odbc:")); } //-------------------------------------------------------------------- sal_Bool isNativeUrl(const ::rtl::OUString& _sUrl) |