diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-03-22 09:47:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-03-23 01:14:13 +0100 |
| commit | b38974391e8d4bf0d450abfaa86bbccbe1022995 (patch) | |
| tree | 8cc2622d96e8ee02cf1f06f10d82bc46ef431a23 /sc/source/filter/xml | |
| parent | 4bdf2829a31e29949bf4d9a008e1f9d2b50bf4c1 (diff) | |
Related: tdf#160056 do calc NumberFormatting via ScInterpreterContext
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 <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sc/source/filter/xml')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 4 |
2 files changed, 2 insertions, 4 deletions
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: { |