summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-07-08 11:45:33 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2020-07-10 09:03:20 +0200
commit0e8a9ab21aeb389f3c8fbf6b5cfb15d1fbdd9680 (patch)
tree7a7426954bfd639547d044034aad99bc6338c9fe
parent63a15281dfcd2a0ab1804fde769f3725d68b96ea (diff)
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@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 5fc0cea87be4b439bb3d3a5281984fd16b05dc28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98349
-rw-r--r--sc/source/ui/view/gridwin.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 48745aec049b..b1a002a332a4 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6292,8 +6292,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 )