diff options
| author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 15:05:52 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 15:07:41 +0200 |
| commit | 743f22045c4ec08c46c259fc0ba240194a391457 (patch) | |
| tree | faed42bb31c4ee767619eb5c3ebd4dec0a41fa03 /connectivity | |
| parent | Merge remote-tracking branch 'origin/master' (diff) | |
| download | core-743f22045c4ec08c46c259fc0ba240194a391457.tar.gz core-743f22045c4ec08c46c259fc0ba240194a391457.zip | |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\)) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'connectivity')
5 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 1ad898560b73..db7ce81152c6 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -868,7 +868,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc const PropertyValue* pEnd = pIter + aArgs.getLength(); for(;pIter != pEnd;++pIter) { - if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ComponentData")) ) + if ( pIter->Name == "ComponentData" ) { Sequence<PropertyValue> aDocumentContext; pIter->Value >>= aDocumentContext; diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 896d34fcd89c..815e752c4f7e 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -121,9 +121,9 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro } } - if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:groupwise"))) + if ( url == "sdbc:address:evolution:groupwise" ) setSDBCAddressType(SDBCAddress::EVO_GWISE); - else if (url.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sdbc:address:evolution:ldap"))) + else if ( url == "sdbc:address:evolution:ldap" ) setSDBCAddressType(SDBCAddress::EVO_LDAP); else setSDBCAddressType(SDBCAddress::EVO_LOCAL); diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index b1b5784086ef..8aebe8e09b7e 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -195,11 +195,11 @@ namespace connectivity for (;pIter != pEnd; ++pIter) { - if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Storage")) ) + if ( pIter->Name == "Storage" ) { xStorage.set(pIter->Value,UNO_QUERY); } - else if ( pIter->Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")) ) + else if ( pIter->Name == "URL" ) { pIter->Value >>= sURL; } diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 8fb63829bbb0..c148646e704d 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -181,13 +181,13 @@ static sal_Int32 readLogLevelFromConfiguration() OUString str; if( bootstrapHandle.getFrom( ASCII_STR( "PQ_LOGLEVEL" ), str ) ) { - if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("NONE")) ) + if ( str == "NONE" ) loglevel = LogLevel::NONE; - else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ERROR")) ) + else if ( str == "ERROR" ) loglevel = LogLevel::ERROR; - else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("SQL")) ) + else if ( str == "SQL" ) loglevel = LogLevel::SQL; - else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("INFO")) ) + else if ( str == "INFO" ) loglevel = LogLevel::INFO; else { diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx index 9ad71b10c82c..314924d9d672 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx @@ -117,9 +117,9 @@ Keys::~Keys() static sal_Int32 string2keytype( const rtl::OUString &type ) { sal_Int32 ret = com::sun::star::sdbcx::KeyType::UNIQUE; - if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("p")) ) + if ( type == "p" ) ret = com::sun::star::sdbcx::KeyType::PRIMARY; - else if( type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("f")) ) + else if ( type == "f" ) ret = com::sun::star::sdbcx::KeyType::FOREIGN; return ret; } |