diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-16 16:45:12 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-17 02:07:43 +0000 |
commit | ef46917ff3163d3fdd5152bda5d16c4503b6ab69 (patch) | |
tree | 73271cd339b19964bc91157207565595774e98b5 /drawinglayer | |
parent | 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2 (diff) |
Put Polygon from tools under tools:: namespace
Polygon is one of these names that Clash with some system objects
A similar work has been done earlier with PolyPolygon.
Change-Id: Icf2217cb2906292b7275760f1a16be0e150312f5
Reviewed-on: https://gerrit.libreoffice.org/17789
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'drawinglayer')
3 files changed, 14 insertions, 14 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 09bc2cc99247..564c6e83a86b 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1858,7 +1858,7 @@ namespace if(rPropertyHolders.Current().getLineColorActive()) { const MetaArcAction* pA = static_cast<const MetaArcAction*>(pAction); - const Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_ARC); + const tools::Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_ARC); const basegfx::B2DPolygon aOutline(aToolsPoly.getB2DPolygon()); createHairlinePrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current()); @@ -1872,7 +1872,7 @@ namespace if(rPropertyHolders.Current().getLineOrFillActive()) { const MetaPieAction* pA = static_cast<const MetaPieAction*>(pAction); - const Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_PIE); + const tools::Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_PIE); const basegfx::B2DPolygon aOutline(aToolsPoly.getB2DPolygon()); createHairlineAndFillPrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current()); @@ -1886,7 +1886,7 @@ namespace if(rPropertyHolders.Current().getLineOrFillActive()) { const MetaChordAction* pA = static_cast<const MetaChordAction*>(pAction); - const Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD); + const tools::Polygon aToolsPoly(pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD); const basegfx::B2DPolygon aOutline(aToolsPoly.getB2DPolygon()); createHairlineAndFillPrimitive(aOutline, rTargetHolders.Current(), rPropertyHolders.Current()); diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index e6a12cda3399..22d3c61d22cd 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -519,15 +519,15 @@ namespace drawinglayer aEndArrow.transform(maCurrentTransformation); pRetval = new SvtGraphicStroke( - Polygon(aLocalPolygon), - tools::PolyPolygon(aStartArrow), - tools::PolyPolygon(aEndArrow), - mfCurrentUnifiedTransparence, - fLineWidth, - eCap, - eJoin, - fMiterLength, - aDashArray); + tools::Polygon(aLocalPolygon), + tools::PolyPolygon(aStartArrow), + tools::PolyPolygon(aEndArrow), + mfCurrentUnifiedTransparence, + fLineWidth, + eCap, + eJoin, + fMiterLength, + aDashArray); } return pRetval; @@ -1266,7 +1266,7 @@ namespace drawinglayer if(aCandidate.count() > 1) { - const Polygon aToolsPolygon(aCandidate); + const tools::Polygon aToolsPolygon(aCandidate); mpMetaFile->AddAction(new MetaPolyLineAction(aToolsPolygon, aLineInfo)); } diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 825e203116ce..9aa861dc3f41 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -1146,7 +1146,7 @@ namespace drawinglayer ::Hatch aVCLHatch(eHatchStyle, Color(rFillHatchAttributes.getColor()), nDistance, nAngle10); // draw hatch using VCL - mpOutputDevice->DrawHatch(tools::PolyPolygon(Polygon(aHatchPolygon)), aVCLHatch); + mpOutputDevice->DrawHatch(tools::PolyPolygon(tools::Polygon(aHatchPolygon)), aVCLHatch); } break; } |