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 /vcl/source/gdi/gdimetafiletools.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 'vcl/source/gdi/gdimetafiletools.cxx')
-rw-r--r-- | vcl/source/gdi/gdimetafiletools.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 97cea08278c3..d7ea6092a859 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -69,7 +69,7 @@ namespace { rTarget.AddAction( new MetaPolyPolygonAction( - PolyPolygon(aResult))); + tools::PolyPolygon(aResult))); } } } @@ -105,7 +105,7 @@ namespace // add clipped geometry rTarget.AddAction( new MetaGradientExAction( - PolyPolygon(aResult), + tools::PolyPolygon(aResult), rGradient)); } } @@ -191,7 +191,7 @@ namespace aPixelPoly.transform(aTransform); // to fill the non-covered parts, use the Xor fill rule of - // PolyPolygon painting. Start with a all-covering polygon and + // tools::PolyPolygon painting. Start with a all-covering polygon and // add the clip polygon one basegfx::B2DPolyPolygon aInvertPixelPoly; @@ -693,7 +693,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case META_POLYPOLYGON_ACTION : { const MetaPolyPolygonAction* pA = static_cast< const MetaPolyPolygonAction* >(pAction); - const PolyPolygon& rPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPoly = pA->GetPolyPolygon(); bDone = handleGeometricContent( aClips.back(), @@ -872,7 +872,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else if(rComment.equalsIgnoreAsciiCase("XPATHFILL_SEQ_BEGIN")) { SvtGraphicFill aFilling; - PolyPolygon aPath; + tools::PolyPolygon aPath; { // read SvtGraphicFill SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ); @@ -896,7 +896,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) if(aResult != aSource) { // add clipped geometry - aFilling.setPath(PolyPolygon(aResult)); + aFilling.setPath(tools::PolyPolygon(aResult)); addSvtGraphicFill(aFilling, aTarget); bDone = true; } @@ -904,7 +904,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else { // exchange with empty polygon - aFilling.setPath(PolyPolygon()); + aFilling.setPath(tools::PolyPolygon()); addSvtGraphicFill(aFilling, aTarget); bDone = true; } @@ -989,7 +989,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case META_GRADIENTEX_ACTION : { const MetaGradientExAction* pA = static_cast< const MetaGradientExAction* >(pAction); - const PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); + const tools::PolyPolygon& rPolyPoly = pA->GetPolyPolygon(); bDone = handleGradientContent( aClips.back(), |