diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 07:51:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-30 11:47:41 +0200 |
| commit | c9d4a2887c13a5df244022276dd79a5bef8af0ea (patch) | |
| tree | fb849270affd5fca01fa26094c89595d18c6f588 /canvas/source/vcl/canvashelper.cxx | |
| parent | d17d4d48b5dc3332fd03f6ef186ed2bda4665e7c (diff) | |
fdo#82577: Handle PolyPolygon
Put the TOOLS PolyPolygon class in the tools namespace. Avoids clash with the Windows
PolyPolygon typedef.
Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66
Diffstat (limited to 'canvas/source/vcl/canvashelper.cxx')
| -rw-r--r-- | canvas/source/vcl/canvashelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 29e4dadb66d0..9510d7e57a3e 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -294,7 +294,7 @@ namespace vclcanvas const ::basegfx::B2DPolyPolygon& rPolyPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon) ); - const PolyPolygon aPolyPoly( tools::mapPolyPolygon( rPolyPoly, viewState, renderState ) ); + const ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon( rPolyPoly, viewState, renderState ) ); if( rPolyPoly.isClosed() ) { @@ -419,7 +419,7 @@ namespace vclcanvas // user coordinates. aStrokedPolyPoly.transform( aMatrix ); - const PolyPolygon aVCLPolyPoly( aStrokedPolyPoly ); + const ::tools::PolyPolygon aVCLPolyPoly( aStrokedPolyPoly ); // TODO(F2): When using alpha here, must handle that via // temporary surface or somesuch. @@ -504,7 +504,7 @@ namespace vclcanvas ::basegfx::B2DPolyPolygon aB2DPolyPoly( ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(xPolyPolygon)); aB2DPolyPoly.setClosed(true); // ensure closed poly, otherwise VCL does not fill - const PolyPolygon aPolyPoly( tools::mapPolyPolygon( + const ::tools::PolyPolygon aPolyPoly( tools::mapPolyPolygon( aB2DPolyPoly, viewState, renderState ) ); const bool bSourceAlpha( renderState.CompositeOperation == rendering::CompositeOperation::SOURCE ); @@ -1247,7 +1247,7 @@ namespace vclcanvas ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, viewState.AffineTransform ) ); - aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::tools::PolyPolygon( aClipPoly ) ); } else { @@ -1270,7 +1270,7 @@ namespace vclcanvas if( aClipPoly.count() ) { // setup non-empty clipping - vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::tools::PolyPolygon( aClipPoly ) ); aClipRegion.Intersect( aRegion ); } else |