ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

interim change, call GetCurrentLanguageData just once here

Browse Source 
Change-Id: Idc21e3346bae4947efa76d212a6a419d8b571104
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199837
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara
2026-02-21 20:02:51 +01:00
parent 99c2cc0673
commit 3e96c2865b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svl/source/numbers/zformat.cxx
+8 -7
View File
@@ -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;
}