summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2025-02-07 14:27:59 +0100
committerAndras Timar <andras.timar@collabora.com>2025-02-08 10:03:53 +0100
commitcdbb588dce1448eeb5d099e24eae781cbba4578f (patch)
tree1b6484158def86dda540f7473e0ae8b22ad3f23d
parent22af804836df3fc1827a2a08b2c91bd76b740177 (diff)
Respect document specific settings – cool#11103 cp-24.04.12-3distro/collabora/co-24.04.12
The purpose of this CheckConfigOptions function is to reset formula separators, when there is a clash with decimal separator. However, ignoring other settings that are coming from the document can cause issues, like that we saw with LOKit, where StringRefAddressSyntax of a German XLSX document was reset to default CONV_UNSPECIFIED, and function =INDIREKT("Sheet1!A1") which was according to CONV_XL_A1 stopped working, and gave error #BEZUG (#REF). Change-Id: I7693deed436ad4e54569a21cc3faeaafceeb459c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181250 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--sc/source/ui/docshell/docsh6.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 0e147f14c3fe..d9ab7e78354b 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -491,6 +491,7 @@ void ScDocShell::CheckConfigOptions()
// One of arg separators conflicts with the current decimal
// separator. Reset them to default.
ScFormulaOptions aNew = rOpt;
+ aNew.GetCalcConfig().MergeDocumentSpecific(m_pDocument->GetCalcConfig());
aNew.ResetFormulaSeparators();
SetFormulaOptions(aNew);
pScMod->SetFormulaOptions(aNew);