From 7870fc222ab9833ab1f7af0633e18c1afaa40119 Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Wed, 8 Jul 2020 11:45:33 +0200 Subject: Don't reset reference marks when editing the formula MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Szymon Kłos (cherry picked from commit 5fc0cea87be4b439bb3d3a5281984fd16b05dc28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98349 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98815 Tested-by: Jenkins --- sc/source/ui/view/gridwin.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sc') diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index ab19bd42488f..0b07934fb0f6 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -6387,8 +6387,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 aReferenceMarks; - ScInputHandler::SendReferenceMarks(pViewShell, aReferenceMarks); + + ScInputHandler* pViewHdl = SC_MOD()->GetInputHdl(pViewShell); + if (!pViewHdl || !pViewHdl->IsEditMode()) + { + std::vector aReferenceMarks; + ScInputHandler::SendReferenceMarks(pViewShell, aReferenceMarks); + } } if ( aOldMode != aDrawMode ) -- cgit v1.2.3