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

[Serge Krot (via logerrit)]

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

New commits:
commit 27b775647e8fd557d5581b6416f3f35f5ae02b4d
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Wed Apr 1 21:08:29 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun Apr 5 00:23:52 2020 +0200

    tdf#131004 fix unstable paint of writer consecutive section frames
    
    Change-Id: I565129dcd077ddbfccedb37dfbf1b9e1acf4eb95
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91532
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 8666dfecbaac69b9dc9a9c23a05654d847608907)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91521

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 1ca2e28d858e..60b25866d073 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -836,8 +836,8 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects, S
 
 void SwLineRects::LockLines( bool bLock )
 {
-    for (iterator it = aLineRects.begin(); it != aLineRects.end(); ++it)
-       (*it).Lock( bLock );
+    for (SwLineRect& rLRect : aLineRects)
+       rLRect.Lock( bLock );
 }
 
 static void lcl_DrawDashedRect( OutputDevice * pOut, SwLineRect const & rLRect )
@@ -1016,7 +1016,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
                                  ((nLi < rLk.Left() && nLi+21 > rLk.Left()) ||
                                   (nLk < rLi.Left() && nLk+21 > rLi.Left())))
                             {
-                                aLineRects.erase(aLineRects.begin() + k);
+                                aLineRects.erase(aLineRects.begin() + i);
                                 // don't continue with inner loop any more:
                                 // the array may shrink!
                                 --i;
@@ -1031,7 +1031,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
                                  ((nLi < rLk.Top() && nLi+21 > rLk.Top()) ||
                                   (nLk < rLi.Top() && nLk+21 > rLi.Top())))
                             {
-                                aLineRects.erase(aLineRects.begin() + k);
+                                aLineRects.erase(aLineRects.begin() + i);
                                 // don't continue with inner loop any more:
                                 // the array may shrink!
                                 --i;