[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/source

[Tor Lillqvist]

 canvas/source/vcl/canvashelper_texturefill.cxx |   52 -------------------------
 1 file changed, 52 deletions(-)

New commits:
commit a95769b378b9d4d77d4409cd72dcdccf32e32744
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Mar 6 23:09:58 2012 +0100

    Remove nasty xor hack for non-Mac vclcanvas
    
    This nowadays really is a pessimization.
    
    (cherry picked from commit 315d82d741c37d1b77f5687b1bdc48a37fb9f29f)
    
    Signed-off-by: Tor Lillqvist <tlillqvist at suse.com>

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 3811ebd..1021d33 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -615,7 +615,6 @@ namespace vclcanvas
                 }
             }
             else
-#if defined(QUARTZ) // TODO: other ports should avoid the XOR-trick too (implementation vs. interface!)
             {
                 const Region aPolyClipRegion( rPoly );
 
@@ -641,57 +640,6 @@ namespace vclcanvas
                     p2ndOutDev->DrawPolyPolygon( rPoly );
                 }
             }
-#else // TODO: remove once doing the XOR-trick in the canvas-layer becomes redundant
-            {
-                // output gradient the hard way: XORing out the polygon
-                rOutDev.Push( PUSH_RASTEROP );
-                rOutDev.SetRasterOp( ROP_XOR );
-                doGradientFill( rOutDev,
-                                rValues,
-                                rColors,
-                                aTotalTransform,
-                                aPolygonDeviceRectOrig,
-                                nStepCount,
-                                true );
-                rOutDev.SetFillColor( COL_BLACK );
-                rOutDev.SetRasterOp( ROP_0 );
-                rOutDev.DrawPolyPolygon( rPoly );
-                rOutDev.SetRasterOp( ROP_XOR );
-                doGradientFill( rOutDev,
-                                rValues,
-                                rColors,
-                                aTotalTransform,
-                                aPolygonDeviceRectOrig,
-                                nStepCount,
-                                true );
-                rOutDev.Pop();
-
-                if( p2ndOutDev )
-                {
-                    p2ndOutDev->Push( PUSH_RASTEROP );
-                    p2ndOutDev->SetRasterOp( ROP_XOR );
-                    doGradientFill( *p2ndOutDev,
-                                    rValues,
-                                    rColors,
-                                    aTotalTransform,
-                                    aPolygonDeviceRectOrig,
-                                    nStepCount,
-                                    true );
-                    p2ndOutDev->SetFillColor( COL_BLACK );
-                    p2ndOutDev->SetRasterOp( ROP_0 );
-                    p2ndOutDev->DrawPolyPolygon( rPoly );
-                    p2ndOutDev->SetRasterOp( ROP_XOR );
-                    doGradientFill( *p2ndOutDev,
-                                    rValues,
-                                    rColors,
-                                    aTotalTransform,
-                                    aPolygonDeviceRectOrig,
-                                    nStepCount,
-                                    true );
-                    p2ndOutDev->Pop();
-                }
-            }
-#endif // complex-clipping vs. XOR-trick
 
 #if OSL_DEBUG_LEVEL > 3
             // extra-verbosity