Kaydet (Commit) 288d12ba authored tarafından Michael Stahl's avatar Michael Stahl

warning C4245 signed/unsigned mismatch

Change-Id: If6222d61a6c75996ce5c40b3eae7895982c49b4a
üst d7e5ad0b
...@@ -143,8 +143,9 @@ inline SwTwips CalcArea( const SwRect &rRect ) ...@@ -143,8 +143,9 @@ inline SwTwips CalcArea( const SwRect &rRect )
// combine all adjacent rectangles // combine all adjacent rectangles
void SwRegionRects::Compress( bool bFuzzy ) void SwRegionRects::Compress( bool bFuzzy )
{ {
for ( size_type i = 0; i < size(); ++i ) for (size_type i = 0; i < size(); )
{ {
bool bRestart(false);
for ( size_type j = i+1; j < size(); ++j ) for ( size_type j = i+1; j < size(); ++j )
{ {
// If one rectangle contains a second completely than the latter // If one rectangle contains a second completely than the latter
...@@ -158,7 +159,7 @@ void SwRegionRects::Compress( bool bFuzzy ) ...@@ -158,7 +159,7 @@ void SwRegionRects::Compress( bool bFuzzy )
{ {
(*this)[i] = (*this)[j]; (*this)[i] = (*this)[j];
erase( begin() + j ); erase( begin() + j );
i = -1; bRestart = true;
break; break;
} }
else else
...@@ -180,11 +181,12 @@ void SwRegionRects::Compress( bool bFuzzy ) ...@@ -180,11 +181,12 @@ void SwRegionRects::Compress( bool bFuzzy )
{ {
(*this)[i] = aUnion; (*this)[i] = aUnion;
erase( begin() + j ); erase( begin() + j );
i = -1; bRestart = true;
break; break;
} }
} }
} }
i = (bRestart) ? 0 : i+1;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment