From 3e96c2865b91eeb324aea91e8f4ee0acd94dba2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 17 Feb 2026 10:22:08 +0000 Subject: [PATCH] interim change, call GetCurrentLanguageData just once here MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idc21e3346bae4947efa76d212a6a419d8b571104 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199837 Reviewed-by: Caolán McNamara Tested-by: Jenkins --- svl/source/numbers/zformat.cxx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 84da3b98c50e..1a0858c450d6 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -2432,6 +2432,7 @@ bool SvNumberformat::GetOutputString(double fNumber, sal_uInt16 nCharCount, OUSt { return false; } + const auto& rLangData = GetCurrentLanguageData(); double fTestNum = fNumber; bool bSign = std::signbit(fTestNum); if (bSign) @@ -2440,7 +2441,7 @@ bool SvNumberformat::GetOutputString(double fNumber, sal_uInt16 nCharCount, OUSt } if (fTestNum < EXP_LOWER_BOUND) { - lcl_GetOutputStringScientific(fNumber, nCharCount, GetCurrentLanguageData(), rOutString); + lcl_GetOutputStringScientific(fNumber, nCharCount, rLangData, rOutString); return true; } @@ -2450,7 +2451,7 @@ bool SvNumberformat::GetOutputString(double fNumber, sal_uInt16 nCharCount, OUSt if (nDigitPre > 15) { - lcl_GetOutputStringScientific(fNumber, nCharCount, GetCurrentLanguageData(), rOutString); + lcl_GetOutputStringScientific(fNumber, nCharCount, rLangData, rOutString); return true; } @@ -2465,11 +2466,11 @@ bool SvNumberformat::GetOutputString(double fNumber, sal_uInt16 nCharCount, OUSt // Subtract the decimal point. --nPrec; } - ImpGetOutputStdToPrecision(fNumber, rOutString, nPrec, rNatNum, GetCurrentLanguageData()); + ImpGetOutputStdToPrecision(fNumber, rOutString, nPrec, rNatNum, rLangData); if (rOutString.getLength() > nCharCount) { // String still wider than desired. Switch to scientific notation. - lcl_GetOutputStringScientific(fNumber, nCharCount, GetCurrentLanguageData(), rOutString); + lcl_GetOutputStringScientific(fNumber, nCharCount, rLangData, rOutString); } return true; } @@ -2509,15 +2510,15 @@ bool SvNumberformat::GetOutputString(double fNumber, bool bRes = false; OutString.clear(); *ppColor = nullptr; // No color change - if (eType & SvNumFormatType::LOGICAL && sFormatstring == rScan.GetKeywords()[NF_KEY_BOOLEAN]) + if (eType & SvNumFormatType::LOGICAL && sFormatstring == rCurrentLang.GetKeywords()[NF_KEY_BOOLEAN]) { if (fNumber) { - OutString = rScan.GetTrueString(); + OutString = rCurrentLang.GetTrueString(); } else { - OutString = rScan.GetFalseString(); + OutString = rCurrentLang.GetFalseString(); } return false; }