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
---
 stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 8 +++-----
 stoc/test/tdmanager/testtdmanager.cxx                  | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'stoc')

diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 91f5b8cd68d8..32d1553dc8f2 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -102,8 +102,7 @@ OUString Translator::translateToInternal(
     OUString const & externalUriReference)
     throw (css::uno::RuntimeException)
 {
-    if (!externalUriReference.matchIgnoreAsciiCaseAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("file:/")))
+    if (!externalUriReference.matchIgnoreAsciiCase("file:/"))
     {
         return externalUriReference;
     }
@@ -112,7 +111,7 @@ OUString Translator::translateToInternal(
     buf.append(externalUriReference.getStr(), i);
     // Some environments (e.g., Java) produce illegal file URLs without an
     // authority part; treat them as having an empty authority part:
-    if (!externalUriReference.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("//"), i))
+    if (!externalUriReference.match("//", i))
     {
         buf.append("//");
     }
@@ -152,8 +151,7 @@ OUString Translator::translateToExternal(
     OUString const & internalUriReference)
     throw (css::uno::RuntimeException)
 {
-    if (!internalUriReference.matchIgnoreAsciiCaseAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("file://")))
+    if (!internalUriReference.matchIgnoreAsciiCase("file://"))
     {
         return internalUriReference;
     }
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index aaacf910d461..c4e19a104738 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -138,8 +138,7 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments)
         OUString url;
         OSL_VERIFY( osl_File_E_None == osl_getFileURLFromSystemPath(
                         arguments[argPos].pData, &url.pData ) );
-        bool supposedToBeCompatible = ! url.endsWithIgnoreAsciiCaseAsciiL(
-            RTL_CONSTASCII_STRINGPARAM("_incomp.rdb") );
+        bool supposedToBeCompatible = ! url.endsWithIgnoreAsciiCase("_incomp.rdb");
 
         css::uno::Reference<css::registry::XSimpleRegistry> xReg(
             m_context->getServiceManager()->createInstanceWithContext(
-- 
cgit