summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-04-27 16:01:25 +0200
committerMichael Stahl <mstahl@redhat.com>2012-04-27 16:14:36 +0200
commite731a98b79968f2c2b1c4e4a183bd952059c557a (patch)
tree62ab8e6540a8b7c4d120640f20c0a817d1b85eda
parentd5ddbe4c3f71c5e8f1667c25e20bbcd565850374 (diff)
argh i am so stupid
merge the 2 conflicting fixes to SwLineRects::ConnectEdges in 33ee840e7b45eb971feef83215841edc0ba66cd7 into something that maybe works.
-rw-r--r--sw/source/core/layout/paintfrm.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 5ef023d4211f..16b5221b8cc5 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -643,7 +643,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
SvPtrarr aCheck( 64 );
- for (size_t i = 0; i < this->size(); )
+ for (size_t i = 0; i < this->size(); ++i)
{
SwLineRect &rL1 = (*this)[i];
if ( !rL1.GetTab() || rL1.IsPainted() || rL1.IsLocked() )
@@ -793,10 +793,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if ( bRemove )
{
this->erase(this->begin() + i);
- }
- else
- {
- ++i;
+ --i;
}
}
}