summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2018-03-07 22:30:31 +0100
committerMichael Stahl <mstahl@redhat.com>2018-03-08 11:53:08 +0100
commite8ed3dfc35975b9e57da7803168f3e2a117a4004 (patch)
tree7314634515e5b0f9bf28dcce733d505693d933f8
parentb8fe96f1da2c42c04a8094ca8c57d49763b7bded (diff)
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 <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 38de3a7fd3b8..0e8b2457c49b 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -976,7 +976,7 @@ namespace vclcanvas
const vcl::Region aPolyClipRegion( aPolyPoly );
rOutDev.Push( PushFlags::CLIPREGION );
- rOutDev.SetClipRegion( aPolyClipRegion );
+ rOutDev.IntersectClipRegion( aPolyClipRegion );
textureFill( rOutDev,
*pGrfObj,
@@ -994,7 +994,7 @@ namespace vclcanvas
OutputDevice& r2ndOutDev( mp2ndOutDev->getOutDev() );
r2ndOutDev.Push( PushFlags::CLIPREGION );
- r2ndOutDev.SetClipRegion( aPolyClipRegion );
+ r2ndOutDev.IntersectClipRegion( aPolyClipRegion );
textureFill( r2ndOutDev,
*pGrfObj,
aPt,