From b38974391e8d4bf0d450abfaa86bbccbe1022995 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 22 Mar 2024 09:47:47 +0000 Subject: Related: tdf#160056 do calc NumberFormatting via ScInterpreterContext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and for the duration of Threaded calculation where there will be no new formats required we can drive number formatting with the unlocked RO policy. Change-Id: Ic0e449acdcf834bc569d13b4a984f13c55316801 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165160 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sc/source/filter/xml/xmlcelli.cxx | 2 +- sc/source/filter/xml/xmlexprt.cxx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'sc/source/filter/xml') diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index c7d21dfc3a17..5f6f5a59258f 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -1299,7 +1299,7 @@ OUString getOutputString( ScDocument* pDoc, const ScAddress& aCellPos ) // like in GetString for document (column) const Color* pColor; sal_uInt32 nNumFmt = pDoc->GetNumberFormat(aCellPos); - return ScCellFormat::GetString(aCell, nNumFmt, &pColor, *pDoc->GetFormatTable(), *pDoc); + return ScCellFormat::GetString(aCell, nNumFmt, &pColor, nullptr, *pDoc); } } } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 4ec6ab6cdbb6..abef9391b1fb 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -223,10 +223,8 @@ OUString lcl_GetFormattedString(ScDocument* pDoc, const ScRefCellValue& rCell, c case CELLTYPE_STRING: { const Color* pColor; - SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); - sal_uInt32 nFormat = pDoc->GetNumberFormat(rAddr); - return ScCellFormat::GetString(rCell, nFormat, &pColor, *pFormatter, *pDoc); + return ScCellFormat::GetString(rCell, nFormat, &pColor, nullptr, *pDoc); } case CELLTYPE_EDIT: { -- cgit v1.2.3