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

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/view/gridwin.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5fc0cea87be4b439bb3d3a5281984fd16b05dc28
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Jul 8 11:45:33 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Jul 8 12:07:07 2020 +0200

    Don't reset reference marks when editing the formula
    
    This prevents us from hiding reference marks on
    switching sheets when formula is under edit.
    
    Change-Id: I4bf1e36967420c12bfa974b0aeefda537a26eed3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98364
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6d354e93ae4b..ec67eab92d28 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6393,8 +6393,13 @@ void ScGridWindow::UpdateSelectionOverlay()
         pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, "EMPTY");
         pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_SELECTION_AREA, "EMPTY");
         SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", "EMPTY");
-        std::vector<ReferenceMark> aReferenceMarks;
-        ScInputHandler::SendReferenceMarks(pViewShell, aReferenceMarks);
+
+        ScInputHandler* pViewHdl = SC_MOD()->GetInputHdl(pViewShell);
+        if (!pViewHdl || !pViewHdl->IsEditMode())
+        {
+            std::vector<ReferenceMark> aReferenceMarks;
+            ScInputHandler::SendReferenceMarks(pViewShell, aReferenceMarks);
+        }
     }
 
     if ( aOldMode != aDrawMode )