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

[Marco Cecchetti]

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

New commits:
commit 88fa077b264a07e43fcac33607adba20e37e25a2
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Sat Dec 2 17:19:33 2017 +0100

    lok: calc: fix: CTRL+RIGHT => crash
    
    Change-Id: I5c127aa4cbdca5e13d2329c1fb68f466464fe432
    Reviewed-on: https://gerrit.libreoffice.org/45799
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a25a62d3f81d..9387c1e6d79c 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1066,7 +1066,8 @@ namespace {
     {
         long nTmp = 0; // row/col to render for nPosition
         long nLastScrPos = 0, nScrPos = 0;
-        while (nScrPos <= nPosition && nTmp < MAXROW)
+        const long nMaxIndex = bRowNotCol ? MAXROW : MAXCOL;
+        while (nScrPos <= nPosition && nTmp < nMaxIndex)
         {
             long nSize = bRowNotCol ? pDoc->GetRowHeight( nTmp, nTabNo )
                                     : pDoc->GetColWidth( nTmp, nTabNo );