[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-2' - sc/source

[Noel Grandin (via logerrit)]

 sc/source/ui/view/tabview2.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a9f33ad967aeb7582e6522b81beebc8c15cc5016
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 2 10:23:42 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed Mar 11 13:56:27 2020 +0100

    tdf#126904 calc right arrow large unexpected column jump in protected sheet
    
    regression from
        commit 7282014e362a1529a36c88eb308df8ed359c2cfa
        Date:   Fri Feb 1 15:15:16 2019 +0100
        tdf#50916 Makes numbers of columns dynamic.
    
    Change-Id: I3b6f6e5430c97ef52f63c406eb3c3b39b9dd578e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89809
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 7ae33e175007d04021f5e911e3f7f6cbd0966804)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89914
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit c3a1880bd26f80272829205b221ebd2b8d1cfafe)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89918
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 6983f2fee4b7..7ed4acd64386 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -739,6 +739,7 @@ void ScTabView::SkipCursorHorizontal(SCCOL& rCurX, SCROW& rCurY, SCCOL nOldX, SC
 
     bool bSkipCell = false;
     bool bHFlip = false;
+    auto nMaxCol = pDoc->ClampToAllocatedColumns(nTab, pDoc->MaxCol());
     do
     {
         bSkipCell = pDoc->ColHidden(rCurX, nTab) || pDoc->IsHorOverlapped(rCurX, rCurY, nTab);
@@ -749,7 +750,7 @@ void ScTabView::SkipCursorHorizontal(SCCOL& rCurX, SCROW& rCurY, SCCOL nOldX, SC
 
         if (bSkipCell)
         {
-            if (rCurX <= 0 || rCurX >= pDoc->MaxCol())
+            if (rCurX <= 0 || rCurX >= nMaxCol)
             {
                 if (bHFlip)
                 {