[Libreoffice-commits] core.git: sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/data/table4.cxx |   29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

New commits:
commit f7936b8ccd0ce9bea3a5e780443e4ae8f35b9da1
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu May 9 15:58:32 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri May 10 09:53:02 2019 +0200

    tdf#125051: fix spellchecking on Calc
    
    Regression from
        commit 7282014e362a1529a36c88eb308df8ed359c2cfa
        Date:   Fri Feb 1 15:15:16 2019 +0100
        tdf#50916 Makes numbers of columns dynamic.
    
    Change-Id: Ibc96c36675d8b530b84f9680654f7d8a3b612d9c
    Reviewed-on: https://gerrit.libreoffice.org/72053
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index d0e8bb3e987d..0fb45a287026 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -2270,27 +2270,18 @@ bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, bool bInSel,
     }
     if (rCol == MAXCOL+1)
         return true;
-    else
+    for (;;)
     {
-        bool bStop = false;
-        while (!bStop)
-        {
-            if (ValidCol(rCol))
-            {
-                bStop = aCol[rCol].GetNextSpellingCell(rRow, bInSel, rMark);
-                if (bStop)
-                    return true;
-                else /*if (rRow == MAXROW+1) */
-                {
-                    rCol++;
-                    rRow = 0;
-                }
-            }
-            else
-                return true;
-        }
+        if (!ValidCol(rCol))
+            return true;
+        if (rCol >= GetAllocatedColumnsCount())
+            return true;
+        if (aCol[rCol].GetNextSpellingCell(rRow, bInSel, rMark))
+            return true;
+         /*else (rRow == MAXROW+1) */
+        rCol++;
+        rRow = 0;
     }
-    return false;
 }
 
 void ScTable::TestTabRefAbs(SCTAB nTable) const