sc/source/ui/docshell/docsh6.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8d4b1c19b8c734964bf0a195f3158d7fa3603b58
Author:     Jaume Pujantell <jaume.pujant...@collabora.com>
AuthorDate: Tue Apr 1 16:02:55 2025 +0200
Commit:     Jaume Pujantell <jaume.pujant...@collabora.com>
CommitDate: Thu Apr 3 14:50:25 2025 +0200

    cool#11497 lok: calc: update separators per locale
    
    On LOK, multiple locales might be in use at the same time, so skipping
    the update of native symbols and separators on load is not viable.
    
    I've also tested the original bug for which this code is skipped and it
    seem to not affect online in the same way.
    
    Change-Id: Ic2e6e329c9bdfb55f6a5fdd540d102c05ac168cb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183594
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183667
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Jaume Pujantell <jaume.pujant...@collabora.com>

diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index d9ab7e78354b..8b802a8b6dea 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -434,7 +434,10 @@ void ScDocShell::SetFormulaOptions( const 
ScFormulaOptions& rOpt, bool bForLoadi
      * once, for the very first document, empty or loaded. */
     static bool bInitOnce = true;
 
-    if (!bForLoading || bInitOnce)
+    // LOKit may need to jugle different symbols lists for differents users so 
a
+    // single load is not enough, otherwise the wrong separators may be 
expected
+    // for the users locale
+    if (!bForLoading || bInitOnce || comphelper::LibreOfficeKit::isActive())
     {
         bool bForceInit = bInitOnce;
         bInitOnce = false;

Reply via email to