[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

[Matúš Kukan]

 vcl/source/gdi/outdev4.cxx |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 87a3fe36ecc3a036806f1ca660c68debc763937d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Jun 17 12:58:09 2014 +0200

    bnc#593614: Avoid rendering artefacts in presentation mode.
    
    By not using XOR rendering, see also fdo#38844.
    The first variant seems to work better.
    
    Basically, this is just cherry-pick of
    bb5c7d6a79309236d4f19bb2498f2e850f735a2f
    
    Change-Id: I0fdccf60601a47c91f467f9d1321d1c25f1ef68c
    Reviewed-on: https://gerrit.libreoffice.org/9824
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 1be80e9..e817e57 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -740,29 +740,10 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
             mpMetaFile->AddAction( new MetaCommentAction( "XGRAD_SEQ_BEGIN" ) );
             mpMetaFile->AddAction( new MetaGradientExAction( rPolyPoly, rGradient ) );
 
-            if( OUTDEV_PRINTER == meOutDevType )
-            {
-                Push( PUSH_CLIPREGION );
-                IntersectClipRegion(Region(rPolyPoly));
-                DrawGradient( aRect, rGradient );
-                Pop();
-            }
-            else
-            {
-                const sal_Bool  bOldOutput = IsOutputEnabled();
-
-                EnableOutput( sal_False );
-                Push( PUSH_RASTEROP );
-                SetRasterOp( ROP_XOR );
-                DrawGradient( aRect, rGradient );
-                SetFillColor( COL_BLACK );
-                SetRasterOp( ROP_0 );
-                DrawPolyPolygon( rPolyPoly );
-                SetRasterOp( ROP_XOR );
-                DrawGradient( aRect, rGradient );
-                Pop();
-                EnableOutput( bOldOutput );
-            }
+            Push( PUSH_CLIPREGION );
+            IntersectClipRegion(Region(rPolyPoly));
+            DrawGradient( aRect, rGradient );
+            Pop();
 
             mpMetaFile->AddAction( new MetaCommentAction( "XGRAD_SEQ_END" ) );
         }