From 73342dbb82ba074d01962359dac50fb2aa36cbeb Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 21 Nov 2013 15:52:45 +0200
Subject: remove unnecessary RTL_CONSTASCII_STRINGPARAM

A final pass through the code, converting code to use the new
OUString and OString methods that can detect string literals.

Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710
---
 shell/source/backends/kde4be/kde4access.cxx | 30 ++++++++++-------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'shell/source/backends/kde4be/kde4access.cxx')

diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx
index 4961d7047c49..4cf3869aa871 100644
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -60,8 +60,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
         sClientProgram = (const sal_Unicode *) aClientProgram.utf16();
         return css::beans::Optional< css::uno::Any >(
             true, uno::makeAny( sClientProgram ) );
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight")))
+    } else if (id == "SourceViewFontHeight")
     {
         QFont aFixedFont;
         short nFontHeight;
@@ -70,8 +69,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
         nFontHeight = aFixedFont.pointSize();
         return css::beans::Optional< css::uno::Any >(
             true, uno::makeAny( nFontHeight ) );
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("SourceViewFontName")))
+    } else if (id == "SourceViewFontName")
     {
         QFont aFixedFont;
         QString aFontName;
@@ -82,15 +80,13 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
         sFontName = (const sal_Unicode *) aFontName.utf16();
         return css::beans::Optional< css::uno::Any >(
             true, uno::makeAny( sFontName ) );
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport")))
+    } else if (id == "EnableATToolSupport")
     {
         /* does not make much sense without an accessibility bridge */
         sal_Bool ATToolSupport = sal_False;
         return css::beans::Optional< css::uno::Any >(
             true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("WorkPathVariable")))
+    } else if (id == "WorkPathVariable")
     {
         QString aDocumentsDir( KGlobalSettings::documentPath() );
         OUString sDocumentsDir;
@@ -101,8 +97,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
         osl_getFileURLFromSystemPath( sDocumentsDir.pData, &sDocumentsURL.pData );
         return css::beans::Optional< css::uno::Any >(
             true, uno::makeAny( sDocumentsURL ) );
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName")))
+    } else if (id == "ooInetFTPProxyName")
     {
         QString aFTPProxy;
         switch ( KProtocolManager::proxyType() )
@@ -128,8 +123,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
             return css::beans::Optional< css::uno::Any >(
                 true, uno::makeAny( sProxy ) );
         }
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort")))
+    } else if (id == "ooInetFTPProxyPort")
     {
         QString aFTPProxy;
         switch ( KProtocolManager::proxyType() )
@@ -155,8 +149,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
             return css::beans::Optional< css::uno::Any >(
                 true, uno::makeAny( nPort ) );
         }
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName")))
+    } else if (id == "ooInetHTTPProxyName")
     {
         QString aHTTPProxy;
         switch ( KProtocolManager::proxyType() )
@@ -182,8 +175,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
             return css::beans::Optional< css::uno::Any >(
                 true, uno::makeAny( sProxy ) );
         }
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort")))
+    } else if (id == "ooInetHTTPProxyPort")
     {
         QString aHTTPProxy;
         switch ( KProtocolManager::proxyType() )
@@ -209,8 +201,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
             return css::beans::Optional< css::uno::Any >(
                 true, uno::makeAny( nPort ) );
         }
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName")))
+    } else if (id == "ooInetHTTPSProxyName")
     {
         QString aHTTPSProxy;
         switch ( KProtocolManager::proxyType() )
@@ -236,8 +227,7 @@ css::beans::Optional< css::uno::Any > getValue(OUString const & id) {
             return css::beans::Optional< css::uno::Any >(
                 true, uno::makeAny( sProxy ) );
         }
-    } else if (id.equalsAsciiL(
-                   RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort")))
+    } else if (id == "ooInetHTTPSProxyPort")
     {
         QString aHTTPSProxy;
         switch ( KProtocolManager::proxyType() )
-- 
cgit