[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

[Jan Holesovsky (via logerrit)]

 sc/source/ui/app/inputhdl.cxx  |    5 +++--
 sc/source/ui/unoobj/docuno.cxx |    5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 65990058f041c3f1d280a69d411eb4ceacf5a721
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Mar 24 15:39:05 2021 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Mar 25 15:51:48 2021 +0100

    lok: Disable the "AutoInput" again.
    
    This partially reverts "lok: sc - suppress LOK editengine events for the calc input bar."
    
    The feature itself is very problematic in Online:
    
    1) causes unwanted jumps to other cells,
    
    2) causes the selection blinking in the cell when typing, and
    
    3) it is very annoying in the form that in which it is implemented
       in LibreOffice anyway, compared to other office suites.
    
    Let's disable it, and enable again when we address the above issues.
    
    This (partially) reverts commit 91319ad56887f932b2da334db560d5d0a79a0280.
    
    Change-Id: I2234455c29069f74d13896474f3499035935931b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113047
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 7e0bb9272970..954af2a304cd 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -806,7 +806,6 @@ ScInputHandler::ScInputHandler()
     if (comphelper::LibreOfficeKit::isActive())
     {
         ScInputHandler::bOptLoaded = true;            // Evaluate App options
-        ScInputHandler::bAutoComplete = true;         // Is set in KeyInput
     }
 }
 
@@ -2680,7 +2679,9 @@ void ScInputHandler::UpdateFormulaMode()
             if (pInputWin)
                 pInputWin->SetFormulaMode(true);
 
-            if ( bAutoComplete )
+            // in LOK, we always need to perform the GetFormulaData() call so
+            // that the formula insertion works
+            if (bAutoComplete || comphelper::LibreOfficeKit::isActive())
                 GetFormulaData();
 
             UpdateParenthesis();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0e74d7dd5cda..9d2539a25bcd 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1177,6 +1177,11 @@ void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans
 {
     SolarMutexGuard aGuard;
 
+    // disable word autocompletion
+    ScAppOptions aAppOptions( SC_MOD()->GetAppOptions() );
+    aAppOptions.SetAutoComplete(false);
+    SC_MOD()->SetAppOptions(aAppOptions);
+
     for (const beans::PropertyValue& rValue : rArguments)
     {
         if (rValue.Name == ".uno:SpellOnline" && rValue.Value.has<bool>())