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

[Libreoffice Gerrit user]

 sw/source/core/crsr/crstrvl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 99f750a7c7bbef67dd6479b77d617f94ce8bfa37
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Mar 6 18:38:37 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Mar 14 21:04:44 2019 +0100

    tdf#123637 sw_redlinehide: fix iteration in SwCursorShell::GotoNextOutline()
    
    If nStartPos == size() and !bUseFirst.
    
    (regression from d0e9cc832d19b622532f01580d9cf78ee0b215db)
    
    Change-Id: I571d24ec5e9d4f2780e7c6d5c8cee09baeaffcc1
    Reviewed-on: https://gerrit.libreoffice.org/68821
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit dfdb7f9fcffe0b8594359c22277b64c7b6cdfd4c)
    Reviewed-on: https://gerrit.libreoffice.org/68845
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 0308bfd590a5bdf602254491b1a76e055e6c3f85)
    Reviewed-on: https://gerrit.libreoffice.org/69169
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 31aaf8b9374e..42436696840b 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1034,13 +1034,13 @@ bool SwCursorShell::GotoNextOutline()
 
     do
     {
-        if (nPos == rNds.GetOutLineNds().size())
+        if (!bUseFirst)
         {
-            nPos = 0;
+            ++nPos;
         }
-        else if (!bUseFirst)
+        if (rNds.GetOutLineNds().size() <= nPos)
         {
-            ++nPos;
+            nPos = 0;
         }
 
         if (bUseFirst)