[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - canvas/source

[Michael Stahl]

 canvas/source/vcl/canvashelper_texturefill.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e89b8a1b5c2312b8d5f96dadb98bdab6b9e44528
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Mar 7 12:21:45 2018 +0100

    VCL canvas: fix clipping of gradients (related: tdf#115142)
    
    When using the presenter console, the secondary screen has
    a small view of the current slide, which is called a "Pane" in sdext.
    
    Clipping for this is done by sd::presenter::PresenterCanvas, which wraps
    the full-screen VCL canvas and has a MergeViewState() to intersect
    the clip region.
    
    The VCL canvas has a bug in its gradientFill() implemenation where it
    overrides the existing clip on the OutputDevice instead of intersecting
    it.
    
    This properly fixes the bug that was wrongly and badly attempted
    to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.
    
    Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff
    (cherry picked from commit 5d710cf7dda27e78f237211fd92418be4dd1c551)
    Reviewed-on: https://gerrit.libreoffice.org/50886
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index c2735a5ce46d..3a9c1a356c3a 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -602,7 +602,7 @@ namespace vclcanvas
                 const vcl::Region aPolyClipRegion( rPoly );
 
                 rOutDev.Push( PushFlags::CLIPREGION );
-                rOutDev.SetClipRegion( aPolyClipRegion );
+                rOutDev.IntersectClipRegion( aPolyClipRegion );
 
                 doGradientFill( rOutDev,
                                 rValues,