From ae80e14a28306b5892c582bfe2082ce56b3edbe7 Mon Sep 17 00:00:00 2001
From: Marco Cecchetti <marco.cecchetti@collabora.com>
Date: Sat, 2 Dec 2017 17:19:33 +0100
Subject: lok: calc: fix: CTRL+RIGHT => crash

Change-Id: I5c127aa4cbdca5e13d2329c1fb68f466464fe432
Reviewed-on: https://gerrit.libreoffice.org/45790
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
---
 sc/source/ui/view/gridwin4.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 );
-- 
cgit