[Libreoffice-commits] core.git: sal/rtl

[Mike Kaganski (via logerrit)]

 sal/rtl/string.cxx  |    7 -------
 sal/rtl/strtmpl.hxx |   24 ++++++------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit 6819ff8549d0a247e9e16f98eddbb7abd287d123
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Feb 25 20:36:09 2022 +0100
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Feb 26 07:27:17 2022 +0100

    Slightly cleanup newReplaceStrAt
    
    Change-Id: I230aa635aa797038055bdbc9453a5daa98412f93
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130465
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx
index de8cabff4c91..2b118a57aada 100644
--- a/sal/rtl/string.cxx
+++ b/sal/rtl/string.cxx
@@ -618,13 +618,6 @@ void SAL_CALL rtl_string_newConcat(rtl_String** ppThis, 
rtl_String* pLeft, rtl_S
     rtl::str::newConcat(ppThis, pLeft, pRight);
 }
 
-static void rtl_string_newConcatL(
-    rtl_String ** newString, rtl_String * left, char const * right,
-    sal_Int32 rightLength)
-{
-    rtl::str::newConcat(newString, left, right, rightLength);
-}
-
 void SAL_CALL rtl_string_ensureCapacity(rtl_String** ppThis, sal_Int32 size) 
SAL_THROW_EXTERN_C()
 {
     rtl::str::ensureCapacity(ppThis, size);
diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index 348b84fab246..256c0cc99dd0 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -1378,33 +1378,21 @@ void newReplaceStrAt                                ( 
IMPL_RTL_STRINGDATA** ppTh
     assert(nNewSubStrLen >= 0);
     /* Append? */
     if ( nIndex >= pStr->length )
-    {
-        if constexpr (sizeof(IMPL_RTL_STRCODE) == sizeof(char))
-            rtl_string_newConcatL( ppThis, pStr, pNewSubStr, nNewSubStrLen );
-        else
-            rtl_uString_newConcatUtf16L( ppThis, pStr, pNewSubStr, 
nNewSubStrLen );
-        return;
-    }
+        return newConcat(ppThis, pStr, pNewSubStr, nNewSubStrLen);
 
     /* not more than the String length could be deleted */
     if ( nCount >= pStr->length-nIndex )
     {
-        nCount = pStr->length-nIndex;
-
         /* Assign of NewSubStr? */
-        if ( !nIndex && (nCount >= pStr->length) )
-        {
-            newFromStr_WithLength( ppThis, pNewSubStr, nNewSubStrLen );
-            return;
-        }
+        if (nIndex == 0)
+            return newFromStr_WithLength( ppThis, pNewSubStr, nNewSubStrLen );
+
+        nCount = pStr->length - nIndex;
     }
 
     /* Assign of Str? */
     if ( !nCount && !nNewSubStrLen )
-    {
-        assign( ppThis, pStr );
-        return;
-    }
+        return assign(ppThis, pStr);
 
     IMPL_RTL_STRINGDATA*    pOrg = *ppThis;
     sal_Int32               nNewLen;