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

[Mike Kaganski (via logerrit)]

 basic/source/runtime/methods.cxx |   26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

New commits:
commit 6c4bc632180c25b3ceb30e32383b3f5db8eaf0e2
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Feb 2 13:33:38 2022 +0100
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Feb 2 16:05:29 2022 +0100

    Use OUStringBuffer in SbRtl_FormatNumber
    
    Change-Id: Ie3e187b7dd1329f8fae04042fa6375c4bde3fa57
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129331
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 26350d6d85f3..8b62ba2260cd 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3423,42 +3423,34 @@ void SbRtl_FormatNumber(StarBASIC*, SbxArray& rPar, 
bool)
         fVal = fabs(fVal); // Always work with non-negatives, to easily handle 
leading zero
 
     static const sal_Unicode decSep = localeData.getNumDecimalSep().toChar();
-    OUString aResult = rtl::math::doubleToUString(
+    OUStringBuffer aResult;
+    rtl::math::doubleToUStringBuffer(aResult,
         fVal, rtl_math_StringFormat_F, nNumDigitsAfterDecimal, decSep,
         bGroupDigits ? localeData.getDigitGrouping().getConstArray() : nullptr,
         localeData.getNumThousandSep().toChar());
 
-    if (!bIncludeLeadingDigit && aResult.getLength() > 1 && 
aResult.startsWith("0"))
-        aResult = aResult.copy(1);
+    if (!bIncludeLeadingDigit && aResult.getLength() > 1)
+        aResult.stripStart('0');
 
     if (nNumDigitsAfterDecimal > 0)
     {
-        sal_Int32 nActualDigits;
         const sal_Int32 nSepPos = aResult.indexOf(decSep);
-        if (nSepPos == -1)
-            nActualDigits = 0;
-        else
-            nActualDigits = aResult.getLength() - nSepPos - 1;
 
         // VBA allows up to 255 digits; rtl::math::doubleToUString outputs up 
to 15 digits
         // for ~small numbers, so pad them as appropriate.
-        if (nActualDigits < nNumDigitsAfterDecimal)
-        {
-            OUStringBuffer sBuf;
-            comphelper::string::padToLength(sBuf, nNumDigitsAfterDecimal - 
nActualDigits, '0');
-            aResult += sBuf;
-        }
+        if (nSepPos >= 0)
+            comphelper::string::padToLength(aResult, nSepPos + 
nNumDigitsAfterDecimal + 1, '0');
     }
 
     if (bNegative)
     {
         if (bUseParensForNegativeNumbers)
-            aResult = "(" + aResult + ")";
+            aResult.insert(0, '(').append(')');
         else
-            aResult = "-" + aResult;
+            aResult.insert(0, '-');
     }
 
-    rPar.Get(0)->PutString(aResult);
+    rPar.Get(0)->PutString(aResult.makeStringAndClear());
 }
 
 namespace {