diff options
| author | Armin Le Grand <alg@apache.org> | 2012-10-23 12:46:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-12 14:31:10 +0100 |
| commit | e717d1dcce7f8906311c5ccdbb2326b61a702630 (patch) | |
| tree | 91290db5179fa4b4927af94c0f023f40dcda434c /cppcanvas | |
| parent | 9e50e5f82927742c56e89258b80bc8cd93bb7e3b (diff) | |
Resolves: #i121237# Rework/Cleanup of Region code...
due to missing complete support for B2DPolygon class
(cherry picked from commit cab10eeb7878edf224a004fd7640bd4adf8d3c51)
Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
svx/source/sdr/overlay/overlaymanagerbuffered.cxx
svx/source/svdraw/svdpntv.cxx
vcl/aqua/source/gdi/salgdi.cxx
vcl/inc/region.h
vcl/inc/unx/gtk/gtkgdi.hxx
vcl/inc/vcl/regband.hxx
vcl/inc/vcl/region.hxx
vcl/os2/source/gdi/salgdi.cxx
vcl/source/gdi/bmpacc3.cxx
vcl/source/gdi/outdev2.cxx
vcl/source/gdi/outmap.cxx
vcl/source/gdi/regband.cxx
vcl/source/gdi/region.cxx
vcl/source/window/window.cxx
vcl/unx/generic/gdi/pspgraphics.cxx
vcl/unx/headless/svpgdi.cxx
vcl/unx/headless/svppspgraphics.cxx
vcl/win/source/gdi/salgdi.cxx
Change-Id: Iee9a66ff431c3cecb7603e445147b67715de0f7d
Remove unused variable to prevent compiler warning
(cherry picked from commit 0ac65ccf079e3e22ac23cbe7ae546504c863c31f)
Change-Id: Icbcaa9d576a7e560d96debc7360bdbe9090b3fd3
Wrong comparison with bool corrected
(cherry picked from commit 612cefdcf6176b6bb847ce899d89af40ef313a90)
Change-Id: I1cf5de6734b588f78d8e870ba7b7860634b461ce
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 2fcff5ad4ba1..a85239140b0e 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1368,7 +1368,7 @@ namespace cppcanvas } else { - if( !pClipAction->GetRegion().HasPolyPolygon() ) + if( !pClipAction->GetRegion().HasPolyPolygonOrB2DPolyPolygon() ) { VERBOSE_TRACE( "ImplRenderer::createActions(): non-polygonal clip " "region encountered, falling back to bounding box!" ); @@ -1390,9 +1390,11 @@ namespace cppcanvas // with old one, just set it) // #121806# explicitly kept integer + basegfx::B2DPolyPolygon aPolyPolygon(pClipAction->GetRegion().GetAsB2DPolyPolygon()); + + aPolyPolygon.transform(rVDev.GetViewTransformation()); updateClipping( - rVDev.LogicToPixel( - pClipAction->GetRegion().GetPolyPolygon() ).getB2DPolyPolygon(), + aPolyPolygon, rFactoryParms, false ); } @@ -1422,7 +1424,7 @@ namespace cppcanvas { MetaISectRegionClipRegionAction* pClipAction = static_cast<MetaISectRegionClipRegionAction*>(pCurrAct); - if( !pClipAction->GetRegion().HasPolyPolygon() ) + if( !pClipAction->GetRegion().HasPolyPolygonOrB2DPolyPolygon() ) { VERBOSE_TRACE( "ImplRenderer::createActions(): non-polygonal clip " "region encountered, falling back to bounding box!" ); @@ -1442,9 +1444,11 @@ namespace cppcanvas // intersect current clip with given clip polygon // #121806# explicitly kept integer + basegfx::B2DPolyPolygon aPolyPolygon(pClipAction->GetRegion().GetAsB2DPolyPolygon()); + + aPolyPolygon.transform(rVDev.GetViewTransformation()); updateClipping( - rVDev.LogicToPixel( - pClipAction->GetRegion().GetPolyPolygon() ).getB2DPolyPolygon(), + aPolyPolygon, rFactoryParms, true ); } |