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

[Julien Nabet (via logerrit)]

 sc/source/ui/Accessibility/AccessibleCell.cxx |   23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 884088de799c2c6947b72eb38cf2e7dbc46a1867
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Sep 4 10:14:03 2022 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Sep 4 15:25:54 2022 +0200

    Simplify by using replaceAll in a loop (sc/AccessibleCell.cxx)
    
    Change-Id: I320f9631fb7c8c6d0c34fde1ad6c7b9479aa57db
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139357
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 854ad84f961d..96020a08ef63 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -473,26 +473,13 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange,
     pRelationSet->AddRelation(aRelation);
 }
 
-static OUString ReplaceOneChar(const OUString& oldOUString, 
std::u16string_view replacedChar, std::u16string_view replaceStr)
-{
-    int iReplace = oldOUString.lastIndexOf(replacedChar);
-    OUString aRet = oldOUString;
-    while(iReplace > -1)
-    {
-        aRet = aRet.replaceAt(iReplace, 1, replaceStr);
-        iReplace = aRet.lastIndexOf(replacedChar, iReplace);
-    }
-    return aRet;
-}
-
 static OUString ReplaceFourChar(const OUString& oldOUString)
 {
-    OUString aRet = ReplaceOneChar(oldOUString, u"\\", u"\\\\");
-    aRet = ReplaceOneChar(aRet, u";", u"\\;");
-    aRet = ReplaceOneChar(aRet, u"=", u"\\=");
-    aRet = ReplaceOneChar(aRet, u",", u"\\,");
-    aRet = ReplaceOneChar(aRet, u":", u"\\:");
-    return aRet;
+    return oldOUString.replaceAll(u"\\", u"\\\\")
+        .replaceAll(u";", u"\\;")
+        .replaceAll(u"=", u"\\=")
+        .replaceAll(u",", u"\\,")
+        .replaceAll(u":", u"\\:");
 }
 
 uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()