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/directx | |
| 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/directx')
| -rw-r--r-- | canvas/source/directx/dx_textlayout_drawhelper.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/directx/dx_winstuff.hxx | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index b565d8c598a4..0a61a8422812 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -171,7 +171,7 @@ namespace dxcanvas } aClipPoly.transform(aMatrix); - const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly)); + const vcl::Region& rClipRegion = vcl::Region(tools::PolyPolygon(aClipPoly)); aVirtualDevice.IntersectClipRegion(rClipRegion); } @@ -179,7 +179,7 @@ namespace dxcanvas { ::basegfx::B2DPolyPolygon aClipPoly(dxcanvas::tools::polyPolygonFromXPolyPolygon2D(rRenderState.Clip)); aClipPoly.transform(aWorldTransform); - const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly)); + const vcl::Region& rClipRegion = vcl::Region(tools::PolyPolygon(aClipPoly)); aVirtualDevice.IntersectClipRegion(rClipRegion); } diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 30f616dda0ad..86ecacdce683 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -50,7 +50,6 @@ #define ULONG win32ULONG #define GradientStyle_RECT win32GradientStyle_RECT #define Polygon win32Polygon -#define PolyPolygon win32PolyPolygon #undef WB_LEFT #undef WB_RIGHT |