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

New commits:
commit 0308bfd590a5bdf602254491b1a76e055e6c3f85
Author:     Michael Stahl <michael.st...@cib.de>
AuthorDate: Wed Mar 6 18:38:37 2019 +0100
Commit:     Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Thu Mar 7 17:45:43 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.st...@cib.de>
    (cherry picked from commit dfdb7f9fcffe0b8594359c22277b64c7b6cdfd4c)
    Reviewed-on: https://gerrit.libreoffice.org/68845
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>

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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to