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

[Dennis Francis (via logerrit)]

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

New commits:
commit f4635b01d0c1dbfca5031a73fe23bad0859671ca
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Mon Apr 26 14:40:11 2021 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Tue May 25 20:39:10 2021 +0200

    lok: Enable the "AutoInput" again.
    
    This partly reverts commit 65990058f041c3f1d280a69d411eb4ceacf5a721.
    
    Change-Id: I494e3ffa3c9824fd6668b1c7322b9cf08accac21
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115456
    Tested-by: Jenkins
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>
    (cherry picked from commit e2f771ffe8e82ba5a5001a71601abf3c45c56192)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116081
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 1223999698c6..53065ba49f15 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -801,6 +801,7 @@ ScInputHandler::ScInputHandler()
     if (comphelper::LibreOfficeKit::isActive())
     {
         ScInputHandler::bOptLoaded = true;            // Evaluate App options
+        ScInputHandler::bAutoComplete = true;         // Is set in KeyInput
     }
 }
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index c2250243b344..e0de184bfcea 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1187,11 +1187,6 @@ 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>())