core.git: Branch 'distro/collabora/co-24.04' - sc/source

[Andras Timar (via logerrit)]

 sc/source/ui/docshell/docsh6.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6524ef659275266f568320e4bc0f5f85ca02ac23
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Feb 7 14:27:59 2025 +0100
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Feb 7 17:51:15 2025 +0100

    Respect document specific settings – cool#11103
    
    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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

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);