diff options
author | Serge Krot <Serge.Krot@cib.de> | 2020-04-01 21:08:29 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-04-05 00:23:52 +0200 |
commit | 27b775647e8fd557d5581b6416f3f35f5ae02b4d (patch) | |
tree | ba24e27dbf376aaa66c4baaf37adbbb44bcd795b /sw/source/core/layout/paintfrm.cxx | |
parent | f7aa951014c283bc629eaea14da2ca0d68f99431 (diff) |
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@CIB.de>
(cherry picked from commit 8666dfecbaac69b9dc9a9c23a05654d847608907)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91521
Diffstat (limited to 'sw/source/core/layout/paintfrm.cxx')
-rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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; |