summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorSzabolcs Dezsi <dezsiszabi@hotmail.com>2012-04-06 15:37:46 +0200
committerJan Holesovsky <kendy@suse.cz>2012-04-06 20:03:42 +0200
commit27cea710fd1e4e8887bcb95e1d25a53d9eae9f22 (patch)
tree008d7618c1ac152dca698a9ad2d791db0afecd58 /configmgr
parent99268dbe1fc25bc2d04eefa1a9f7e2cf7b398065 (diff)
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 'configmgr')
-rw-r--r--configmgr/source/components.cxx12
-rw-r--r--configmgr/source/configurationprovider.cxx2
-rw-r--r--configmgr/source/data.cxx2
-rw-r--r--configmgr/source/type.cxx2
4 files changed, 9 insertions, 9 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index b3767eeae973..54e20e4fe154 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -540,14 +540,14 @@ Components::Components(
}
rtl::OUString type(conf.copy(i, c - i));
rtl::OUString url(expand(conf.copy(c + 1, n - c - 1)));
- if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("xcsxcu"))) {
+ if ( type == "xcsxcu" ) {
parseXcsXcuLayer(layer, url);
layer += 2; //TODO: overflow
} else if ( type == "bundledext" )
{
parseXcsXcuIniLayer(layer, url, false);
layer += 2; //TODO: overflow
- } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sharedext"))) {
+ } else if ( type == "sharedext" ) {
if (sharedExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
rtl::OUString(
@@ -559,7 +559,7 @@ Components::Components(
sharedExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
layer += 2; //TODO: overflow
- } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("userext"))) {
+ } else if ( type == "userext" ) {
if (userExtensionLayer_ != -1) {
throw css::uno::RuntimeException(
rtl::OUString(
@@ -571,13 +571,13 @@ Components::Components(
userExtensionLayer_ = layer;
parseXcsXcuIniLayer(layer, url, true);
layer += 2; //TODO: overflow
- } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("module"))) {
+ } else if ( type == "module" ) {
parseModuleLayer(layer, url);
++layer; //TODO: overflow
- } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("res"))) {
+ } else if ( type == "res" ) {
parseResLayer(layer, url);
++layer; //TODO: overflow
- } else if (type.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("user"))) {
+ } else if ( type == "user" ) {
if (url.isEmpty()) {
throw css::uno::RuntimeException(
rtl::OUString(
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index fcb605e42819..3f41805b446e 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -365,7 +365,7 @@ void Service::setLocale(css::lang::Locale const & eLocale)
css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
osl::MutexGuard guard(*lock_);
css::lang::Locale loc;
- if (locale_.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*"))) {
+ if ( locale_ == "*" ) {
loc.Language = locale_;
} else if (! locale_.isEmpty()) {
try {
diff --git a/configmgr/source/data.cxx b/configmgr/source/data.cxx
index 963d3537defc..78fa00c262c8 100644
--- a/configmgr/source/data.cxx
+++ b/configmgr/source/data.cxx
@@ -224,7 +224,7 @@ rtl::Reference< Node > Data::resolvePathRepresentation(
if (path != 0) {
path->clear();
}
- if (pathRepresentation.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))) {
+ if ( pathRepresentation == "/" ) {
if (canonicRepresentation != 0) {
*canonicRepresentation = pathRepresentation;
}
diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx
index 0fae6abfdf92..c1913cf2fdbd 100644
--- a/configmgr/source/type.cxx
+++ b/configmgr/source/type.cxx
@@ -150,7 +150,7 @@ Type getDynamicType(css::uno::Any const & value) {
case css::uno::TypeClass_SEQUENCE: //TODO
{
rtl::OUString name(value.getValueType().getTypeName());
- if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("[]byte"))) {
+ if ( name == "[]byte" ) {
return TYPE_HEXBINARY;
} else if (name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("[]boolean")))