targeted string re-work

Change-Id: I6eb2242506ef2d230770e513579caf4455ec37d5

4 files changed, 18 insertions, 18 deletions

diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 544f40dcbd4e..47d4138d62f4 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -119,7 +119,7 @@ static OUString xdg_user_dir_lookup (const char *type)
 
     if (!aSecurity.getHomeDir( aHomeDirURL ) )
     {
-        osl::FileBase::getFileURLFromSystemPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp")), aDocumentsDirURL);
+        osl::FileBase::getFileURLFromSystemPath(rtl::OUString("/tmp"), aDocumentsDirURL);
         return aDocumentsDirURL;
     }
 
@@ -127,12 +127,12 @@ static OUString xdg_user_dir_lookup (const char *type)
     if (config_home == NULL || config_home[0] == 0)
     {
         aConfigFileURL = OUString(aHomeDirURL);
-        aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/.config/user-dirs.dirs"));
+        aConfigFileURL += OUString("/.config/user-dirs.dirs");
     }
     else
     {
         aConfigFileURL = OUString::createFromAscii(config_home);
-        aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/user-dirs.dirs"));
+        aConfigFileURL += OUString("/user-dirs.dirs");
     }
 
     if(osl_File_E_None == osl_openFile(aConfigFileURL.pData, &handle, osl_File_OpenFlag_Read))
@@ -433,7 +433,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const Configurati
                 g_get_real_name(), osl_getThreadTextEncoding() ) );
             if( aCompleteName != "Unknown" )
             {
-                if( aCompleteName.trim().indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")), 0) != -1 )
+                if( aCompleteName.trim().indexOf(rtl::OUString(" "), 0) != -1 )
                     return sal_True;
             }
         }
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 1734305e8781..3885a8bea88d 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -183,7 +183,7 @@ static rtl::OUString ImplGetLocale(int category)
 
     // Return "en-US" for C locales
     if( (locale == NULL) || ( locale[0] == 'C' && locale[1] == '\0' ) )
-        return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en-US" ) );
+        return rtl::OUString( "en-US"  );
 
 
     const char *cp;
@@ -284,7 +284,7 @@ void LocaleBackend::setPropertyValue(
 {
     throw css::lang::IllegalArgumentException(
         rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+            "setPropertyValue not supported"),
         static_cast< cppu::OWeakObject * >(this), -1);
 }
 
@@ -319,7 +319,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
 //------------------------------------------------------------------------------
 
 rtl::OUString SAL_CALL LocaleBackend::getBackendName(void) {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LocaleBackend")) ;
+    return rtl::OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ;
 }
 
 //------------------------------------------------------------------------------
@@ -335,7 +335,7 @@ rtl::OUString SAL_CALL LocaleBackend::getImplementationName(void)
 uno::Sequence<rtl::OUString> SAL_CALL LocaleBackend::getBackendServiceNames(void)
 {
     uno::Sequence<rtl::OUString> aServiceNameList(1);
-    aServiceNameList[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.LocaleBackend")) ;
+    aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.LocaleBackend") ;
     return aServiceNameList ;
 }
 
diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index aaf7ebfb2e52..d70cc4bdd2e1 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -217,7 +217,7 @@ void MacOSXBackend::setPropertyValue(
 {
     throw css::lang::IllegalArgumentException(
         rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+            "setPropertyValue not supported"),
         static_cast< cppu::OWeakObject * >(this), -1);
 }
 
@@ -417,7 +417,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                 CFStringRef rException = (CFStringRef) CFArrayGetValueAtIndex(rExceptionsList, idx);
 
                 if (idx>0)
-                    aProxyBypassList += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
+                    aProxyBypassList += rtl::OUString(";");
 
                 aProxyBypassList += CFStringToOUString(rException);
             }
@@ -445,7 +445,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
 
 rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void)
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.MacOSXBackend"));
+    return rtl::OUString("com.sun.star.comp.configuration.backend.MacOSXBackend");
 }
 
 //------------------------------------------------------------------------------
@@ -461,7 +461,7 @@ rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void)
 uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void)
 {
     uno::Sequence<rtl::OUString> aServiceNameList(1);
-    aServiceNameList[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.MacOSXBackend"));
+    aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.MacOSXBackend");
 
     return aServiceNameList;
 }
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 7b0a9ed0b80a..4f364f7246c0 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -211,12 +211,12 @@ WinInetBackend::WinInetBackend()
 
                 ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, rtl::OUString());
                 ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "http" ) ) );
+                    "http"  ) );
                 ProxyEntry aHttpsProxy  = FindProxyEntry( aProxyList, rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "https" ) ) );
+                    "https"  ) );
 
                 ProxyEntry aFtpProxy  = FindProxyEntry( aProxyList, rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM( "ftp" ) ) );
+                    "ftp"  ) );
 
                 if( aTypeIndepProxy.Server.getLength() )
                 {
@@ -307,7 +307,7 @@ void WinInetBackend::setPropertyValue(
 {
     throw css::lang::IllegalArgumentException(
         rtl::OUString(
-            RTL_CONSTASCII_USTRINGPARAM("setPropertyValue not supported")),
+            "setPropertyValue not supported"),
         static_cast< cppu::OWeakObject * >(this), -1);
 }
 
@@ -350,7 +350,7 @@ css::uno::Any WinInetBackend::getPropertyValue(
 //------------------------------------------------------------------------------
 
 rtl::OUString SAL_CALL WinInetBackend::getBackendName(void) {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.WinInetBackend")) ;
+    return rtl::OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ;
 }
 
 //------------------------------------------------------------------------------
@@ -366,7 +366,7 @@ rtl::OUString SAL_CALL WinInetBackend::getImplementationName(void)
 uno::Sequence<rtl::OUString> SAL_CALL WinInetBackend::getBackendServiceNames(void)
 {
     uno::Sequence<rtl::OUString> aServiceNameList(1);
-    aServiceNameList[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.backend.WinInetBackend")) ;
+    aServiceNameList[0] = rtl::OUString( "com.sun.star.configuration.backend.WinInetBackend") ;
 
     return aServiceNameList ;
 }