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

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |    2 +-
 sc/source/ui/view/gridwin.cxx |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 0e8a9ab21aeb389f3c8fbf6b5cfb15d1fbdd9680
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: Fri Jul 10 09:03:20 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>
    (cherry picked from commit 5fc0cea87be4b439bb3d3a5281984fd16b05dc28)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98349

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 )
commit 63a15281dfcd2a0ab1804fde769f3725d68b96ea
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jul 7 15:56:19 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jul 10 09:03:13 2020 +0200

    Get correct tab for current selection
    
    Change-Id: Ie3146675a5b6cca5357fccc668ce17b859836147
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98315
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 88417fb01bf03969970b574421a7688768dff6ef)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98340

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 5569039be769..d182d3ae828b 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -494,7 +494,7 @@ void ScInputHandler::UpdateLokReferenceMarks()
         long nX2 = rViewData.GetRefEndX();
         long nY1 = rViewData.GetRefStartY();
         long nY2 = rViewData.GetRefEndY();
-        long nTab = rViewData.GetRefTabNo();
+        long nTab = rViewData.GetTabNo();
 
         PutInOrder(nX1, nX2);
         PutInOrder(nY1, nY2);