[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

Thorsten Behrens thorsten at kemper.freedesktop.org
Tue Apr 6 14:11:24 PDT 2010


 patches/dev300/vcl-stl-fix.diff |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit bc571534c9b7435429003010d733e9c3a34df32d
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Tue Apr 6 22:57:30 2010 +0200

    Remove last hunk from vcl-stl-fix
    
    * patches/dev300/vcl-stl-fix.diff: nested for loop containing
      continue fooled me, binning this behaviour-changing fix
      (fixes deb#576665)
    (cherry picked from commit 490940798bab3840be351a451ad06c18ea69d0ff)

diff --git a/patches/dev300/vcl-stl-fix.diff b/patches/dev300/vcl-stl-fix.diff
index 549ed3c..0452d9f 100644
--- a/patches/dev300/vcl-stl-fix.diff
+++ b/patches/dev300/vcl-stl-fix.diff
@@ -60,14 +60,3 @@ index ae281ab..0b02ad0 100644
  
              // prepare to split the old trapezoid and keep its upper part
              // find the old trapezoids entry in the VerticalTrapSet and remove it
-@@ -1463,7 +1477,10 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
-             for(; aVTSit != aVTSPair.second; ++aVTSit )
-             {
-                 if( *aVTSit != *aActiveTrapsIt )
-+                {
-+                    ++aActiveTrapsIt;
-                     continue;
-+                }
-                 aVerticalTraps.erase( aVTSit );
-                 break;
-             }


More information about the ooo-build-commit mailing list