diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-03-07 22:30:31 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-03-08 14:43:48 +0100 |
| commit | a1b3ae95e35fe0669bcc9df020fa606e6a3cca75 (patch) | |
| tree | 0c03b36b26ae0a6802e6bef57e49fe137785e800 | |
| parent | 34442b85bfb0c451738b4db023345a7484463321 (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>
(cherry picked from commit e8ed3dfc35975b9e57da7803168f3e2a117a4004)
Reviewed-on: https://gerrit.libreoffice.org/50939
| -rw-r--r-- | canvas/source/vcl/canvashelper_texturefill.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 3a9c1a356c3a..e1cb3105950f 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -1061,7 +1061,7 @@ namespace vclcanvas const vcl::Region aPolyClipRegion( aPolyPoly ); rOutDev.Push( PushFlags::CLIPREGION ); - rOutDev.SetClipRegion( aPolyClipRegion ); + rOutDev.IntersectClipRegion( aPolyClipRegion ); textureFill( rOutDev, *pGrfObj, @@ -1079,7 +1079,7 @@ namespace vclcanvas OutputDevice& r2ndOutDev( mp2ndOutDev->getOutDev() ); r2ndOutDev.Push( PushFlags::CLIPREGION ); - r2ndOutDev.SetClipRegion( aPolyClipRegion ); + r2ndOutDev.IntersectClipRegion( aPolyClipRegion ); textureFill( r2ndOutDev, *pGrfObj, aPt, |