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

[Michael Meeks (via logerrit)]

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

New commits:
commit 91319ad56887f932b2da334db560d5d0a79a0280
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Feb 4 14:35:04 2021 +0000
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu Feb 4 19:35:01 2021 +0100

    lok: sc - suppress LOK editengine events for the calc input bar.
    
    The calc input uses an EditEngine - but it emits events as if it is
    part of the document - as well as emitting events as if it is a dialog
    window. This causes horrible jumping artifacts to the top of the
    document with word auto-completion and typing in cells a few page down.
    
    Also remove obsolete tweak to turn off autocorrect for LOK, since
    it was contradicted by: 1f0943e5e9432f96daff9f3b006388d5bc7415b2
    
    Change-Id: I7352cd3b5ca6d18645cfd9e18959b0e44ec969d7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110419
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Henry Castro <hcastro at collabora.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 20ef9abf3742..b106a188dbd3 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1518,6 +1518,10 @@ void ScTextWnd::InitEditEngine()
         mpEditEngine->SetText(aString); // At least the right text then
 
     mpEditView = std::make_unique<EditView>(mpEditEngine.get(), this);
+
+    // we get cursor, selection etc. messages from the VCL/window layer
+    // otherwise these are injected into the document causing confusion.
+    mpEditView->SupressLOKMessages(true);
     mpEditView->SetInsertMode(bIsInsertMode);
 
     if (comphelper::LibreOfficeKit::isActive())
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9d2539a25bcd..0e74d7dd5cda 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1177,11 +1177,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>())