Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator

7 files changed, 37 insertions, 121 deletions

diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 7c59762cb01b..9b859c98b2d9 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -169,32 +169,11 @@ css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName)
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
         css::uno::RuntimeException)
 {
-    if (PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
+      || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
+      || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
+      || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
+      || PropertyName == "ooInetProxyType" )
     {
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
     }
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 8d1feb2802c6..3d9542b1f23f 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -422,7 +422,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
         {
             rtl::OUString aCompleteName( rtl::OStringToOUString(
                 g_get_real_name(), osl_getThreadTextEncoding() ) );
-            if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) )
+            if( aCompleteName != "Unknown" )
                 return sal_True;
         }
             break;
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
         {
             rtl::OUString aCompleteName( rtl::OStringToOUString(
                 g_get_real_name(), osl_getThreadTextEncoding() ) );
-            if( !aCompleteName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Unknown")) )
+            if( aCompleteName != "Unknown" )
             {
                 if( aCompleteName.trim().indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")), 0) != -1 )
                     return sal_True;
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index ac5e93635fca..57a1a4e198a6 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -165,9 +165,7 @@ Service::Service(): enabled_(false) {
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
             desktop;
-        enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("GNOME")) &&
-            ((orbit_major_version == 2 && orbit_minor_version >= 8) ||
-             orbit_major_version > 2);
+        enabled_ = desktop == "GNOME" && ((orbit_major_version == 2 && orbit_minor_version >= 8) || orbit_major_version > 2);
             // ORBit-2 versions < 2.8 cause a deadlock with the gtk+ VCL plugin
     }
 }
diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 2503e9bafe91..1c87c48a02ec 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -164,8 +164,7 @@ Service::Service(): enabled_(false) {
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
             desktop;
-        enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE4")) &&
-            KApplication::kApplication() != 0;
+        enabled_ = desktop == "KDE4" && KApplication::kApplication() != 0;
     }
 }
 
@@ -186,32 +185,11 @@ css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
         css::uno::RuntimeException)
 {
-    if (PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    if (PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
+     || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
+     || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
+     || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
+     || PropertyName == "ooInetProxyType" )
     {
         return css::uno::makeAny(
             enabled_
diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 1a2fb2d49575..64321545111b 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -164,8 +164,7 @@ Service::Service(): enabled_(false) {
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>=
             desktop;
-        enabled_ = desktop.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE")) &&
-            KApplication::kApplication() != 0;
+        enabled_ = desktop == "KDE" && KApplication::kApplication() != 0;
     }
 }
 
@@ -186,32 +185,11 @@ css::uno::Any Service::getPropertyValue(rtl::OUString const & PropertyName)
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
         css::uno::RuntimeException)
 {
-    if (PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ExternalMailer")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")) ||
-        PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
+      || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"
+      || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort"
+      || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy"
+      || PropertyName == "ooInetProxyType" )
     {
         return css::uno::makeAny(
             enabled_
diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index e19b9717d517..055628f936bf 100644
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
@@ -227,8 +227,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
         css::uno::RuntimeException)
 {
-    if (PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")))
+    if ( PropertyName == "WorkPathVariable" )
     {
         rtl::OUString aDocDir;
         NSArray* pPaths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, true );
@@ -254,8 +253,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
             OSL_TRACE( "Got nil or empty list of user document directories" );
         }
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
+    } else if ( PropertyName == "ooInetFTPProxyName" )
     {
         ProxyEntry aFtpProxy;
 
@@ -278,8 +276,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                     true, uno::makeAny( aFtpProxy.Server ) ) );
         }
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
+    } else if ( PropertyName == "ooInetFTPProxyPort" )
     {
         ProxyEntry aFtpProxy;
 
@@ -302,8 +299,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                     true, uno::makeAny( aFtpProxy.Port ) ) );
         }
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
+    } else if ( PropertyName == "ooInetHTTPProxyName" )
     {
         ProxyEntry aHttpProxy;
 
@@ -326,8 +322,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                     true, uno::makeAny( aHttpProxy.Server ) ) );
         }
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
+    } else if ( PropertyName == "ooInetHTTPProxyPort" )
     {
         ProxyEntry aHttpProxy;
 
@@ -350,8 +345,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                     true, uno::makeAny( aHttpProxy.Port ) ) );
         }
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
+    } else if ( PropertyName == "ooInetHTTPSProxyName" )
     {
         ProxyEntry aHttpsProxy;
 
@@ -374,8 +368,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                     true, uno::makeAny( aHttpsProxy.Server ) ) );
         }
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
+    } else if ( PropertyName == "ooInetHTTPSProxyPort" )
     {
         ProxyEntry aHttpsProxy;
 
@@ -398,16 +391,14 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                     true, uno::makeAny( aHttpsProxy.Port ) ) );
         }
         return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    } else if ( PropertyName == "ooInetProxyType" )
     {
         // override default for ProxyType, which is "0" meaning "No proxies".
         sal_Int32 nProperties = 1;
         return css::uno::makeAny(
             css::beans::Optional< css::uno::Any >(
                 true, uno::makeAny( nProperties ) ) );
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")))
+    } else if ( PropertyName == "ooInetNoProxy" )
     {
         rtl::OUString aProxyBypassList;
 
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index fb14831dfdf0..7b0a9ed0b80a 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -317,36 +317,28 @@ css::uno::Any WinInetBackend::getPropertyValue(
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
         css::uno::RuntimeException)
 {
-    if (PropertyName.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
+    if ( PropertyName == "ooInetFTPProxyName" )
     {
         return css::uno::makeAny(valueFtpProxyName_);
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
+    } else if ( PropertyName == "ooInetFTPProxyPort" )
     {
         return css::uno::makeAny(valueFtpProxyPort_);
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
+    } else if ( PropertyName == "ooInetHTTPProxyName" )
     {
         return css::uno::makeAny(valueHttpProxyName_);
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
+    } else if ( PropertyName == "ooInetHTTPProxyPort" )
     {
         return css::uno::makeAny(valueHttpProxyPort_);
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
+    } else if ( PropertyName == "ooInetHTTPSProxyName" )
     {
         return css::uno::makeAny(valueHttpsProxyName_);
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
+    } else if ( PropertyName == "ooInetHTTPSProxyPort" )
     {
         return css::uno::makeAny(valueHttpsProxyPort_);
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy")))
+    } else if ( PropertyName == "ooInetNoProxy" )
     {
         return css::uno::makeAny(valueNoProxy_);
-    } else if (PropertyName.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetProxyType")))
+    } else if ( PropertyName == "ooInetProxyType" )
     {
         return css::uno::makeAny(valueProxyType_);
     } else {