[Libreoffice-commits] core.git: winaccessibility/source

[Julien Nabet (via logerrit)]

 winaccessibility/source/UAccCOM/AccTextBase.cxx |   35 ++++--------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

New commits:
commit 5f86f491701dc9f6f52129cf87644167e95ab40a
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Sep 8 21:02:31 2022 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Sep 9 06:32:44 2022 +0200

    Simplify by using replaceAll in a loop (winaccessibility/AccTextBase)
    
    Change-Id: I68c895033d26c81c76e680d2042aac941d56d213
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139707
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx 
b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index a1f371a47ec9..40620bb5b64f 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -74,8 +74,6 @@ sal_Int16 lcl_matchIA2TextBoundaryType(IA2TextBoundaryType 
boundaryType)
 // Construction/Destruction
 
 
-static OUString ReplaceFourChar(OUString const & oldOUString);
-
 CAccTextBase::CAccTextBase()
 {}
 
@@ -182,7 +180,12 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::get_attributes(long offset, long
         if (bHaveNumberingLevel && bHaveNumberingRules && 
bHaveNumberingPrefixAttr)
         {
             strAttrs.append(';');
-            numberingPrefix = ReplaceFourChar(numberingPrefix);
+            numberingPrefix = numberingPrefix.replaceAll(u"\\", u"\\\\")
+                                  .replaceAll(u";", u"\\;")
+                                  .replaceAll(u"=", u"\\=")
+                                  .replaceAll(u",", u"\\,")
+                                  .replaceAll(u":", u"\\:");
+
             
strAttrs.append(CMAccessible::get_String4Numbering(anyNumRule,numberingLevel,numberingPrefix));
             bHaveNumberingLevel = false;
             bHaveNumberingRules = false;
@@ -882,30 +885,4 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::put_XInterface(hyper pXInterface
     } catch(...) { return E_FAIL; }
 }
 
-static OUString ReplaceOneChar(OUString const & oldOUString, sal_Unicode 
replacedChar, std::u16string_view replaceStr)
-{
-    auto s = oldOUString;
-    int iReplace = s.lastIndexOf(replacedChar);
-    if (iReplace > -1)
-    {
-        for(;iReplace>-1;)
-        {
-            s = s.replaceAt(iReplace,1, replaceStr);
-            iReplace=s.lastIndexOf(replacedChar,iReplace);
-        }
-    }
-    return s;
-}
-
-static OUString ReplaceFourChar(OUString const & oldOUString)
-{
-    auto s = oldOUString;
-    s = ReplaceOneChar(s, '\\', u"\\\\");
-    s = ReplaceOneChar(s, ';', u"\\;");
-    s = ReplaceOneChar(s, '=', u"\\=");
-    s = ReplaceOneChar(s, ',', u"\\,");
-    s = ReplaceOneChar(s, ':', u"\\:");
-    return s;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */