From 9ab0b38e95133dab720408cc2c80093b8a201c10 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 15 Feb 2012 15:26:43 +0100
Subject: Various string function clean up

Added:
* rtl::OString::matchL
* rtl::OString::endsWith
* rtl::OString::endsWithL
* rtl::OString::indexOfL
* rtl::OString::replaceFirst
* rtl::OString::replaceAll
* rtl::OString::getToken
* rtl::OUString::endsWith
* rtl::OUString::replaceFirst
* rtl::OUString::replaceFirstAsciiL
* rtl::OUString::replaceFirstAsciiLAsciiL
* rtl::OUString::replaceAll
* rtl::OUString::replaceAllAsciiL
* rtl::OUString::replaceAllAsciiLAsciiL
* rtl::OUString::getToken
plus underlying C functions where necessary

Deprecated:
* comphelper::string::remove
* comphelper::string::getToken

Removed:
* comphelper::string::searchAndReplaceAsciiL
* comphelper::string::searchAndReplaceAllAsciiWithAscii
* comphelper::string::searchAndReplaceAsciiI
* comphelper::string::replace
* comphelper::string::matchL
* comphelper::string::matchIgnoreAsciiCaseL
* comphelper::string::indexOfL

Also fixed some apparent misuses of RTL_CONSTASCII_USTRINGPARAM ->
RTL_CONSTASCII_STRINGPARAM.
---
 sc/source/ui/app/inputhdl.cxx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'sc')

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index baefc8a33b4f..2fa6ae399b46 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2754,25 +2754,33 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode )
                 if (aReplace.isEmpty())
                     aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkStart();
                 if (!aReplace.equalsAsciiL("\"", 1))
-                    aString = comphelper::string::replace(aString, aReplace, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")));
+                    aString = aString.replaceAll(
+                        aReplace,
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")));
 
                 aReplace = rtl::OUString(pAuto->GetEndDoubleQuote());
                 if (aReplace.isEmpty())
                     aReplace = ScGlobal::pLocaleData->getDoubleQuotationMarkEnd();
                 if (!aReplace.equalsAsciiL("\"", 1))
-                    aString = comphelper::string::replace(aString, aReplace, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")));
+                    aString = aString.replaceAll(
+                        aReplace,
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")));
 
                 aReplace = rtl::OUString(pAuto->GetStartSingleQuote());
                 if (aReplace.isEmpty())
                     aReplace = ScGlobal::pLocaleData->getQuotationMarkStart();
                 if (!aReplace.equalsAsciiL("'", 1))
-                    aString = comphelper::string::replace(aString, aReplace, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
+                    aString = aString.replaceAll(
+                        aReplace,
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
 
                 aReplace = rtl::OUString(pAuto->GetEndSingleQuote());
                 if (aReplace.isEmpty())
                     aReplace = ScGlobal::pLocaleData->getQuotationMarkEnd();
                 if (!aReplace.equalsAsciiL("'", 1))
-                    aString = comphelper::string::replace(aString, aReplace, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
+                    aString = aString.replaceAll(
+                        aReplace,
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'")));
             }
         }
 
-- 
cgit