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

[Thorsten Behrens]

 canvas/source/vcl/canvashelper_texturefill.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b327393da7fb0fb2e28a3571502a95869b225744
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date:   Wed Mar 7 22:30:31 2018 +0100

    VCL canvas: fix another clipping mistake (related: tdf#115142)
    
    Follow-up to 5d710cf7dda27e78f237211fd92418be4dd1c551 -
    setupOutDevState() tends to set a clip, better not overwrite that.
    
    Change-Id: I52aa7db3ef12e9c2902016460e1bf4914328dc7c
    Reviewed-on: https://gerrit.libreoffice.org/50920
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    (cherry picked from commit e8ed3dfc35975b9e57da7803168f3e2a117a4004)
    Reviewed-on: https://gerrit.libreoffice.org/50940
    Tested-by: Michael Stahl <mst...@redhat.com>
    (cherry picked from commit 5acef0c01a38cb9217bef5b38ba521c23c304e0f)
    Reviewed-on: https://gerrit.libreoffice.org/50956
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
    Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx 
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 3250fc879746..61a8eaa5cb75 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -1064,7 +1064,7 @@ namespace vclcanvas
                             const vcl::Region aPolyClipRegion( aPolyPoly );
 
                             rOutDev.Push( PushFlags::CLIPREGION );
-                            rOutDev.SetClipRegion( aPolyClipRegion );
+                            rOutDev.IntersectClipRegion( aPolyClipRegion );
 
                             textureFill( rOutDev,
                                          *pGrfObj,
@@ -1082,7 +1082,7 @@ namespace vclcanvas
                                 OutputDevice& r2ndOutDev( 
mp2ndOutDev->getOutDev() );
                                 r2ndOutDev.Push( PushFlags::CLIPREGION );
 
-                                r2ndOutDev.SetClipRegion( aPolyClipRegion );
+                                r2ndOutDev.IntersectClipRegion( 
aPolyClipRegion );
                                 textureFill( r2ndOutDev,
                                              *pGrfObj,
                                              aPt,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits