From ef46917ff3163d3fdd5152bda5d16c4503b6ab69 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sun, 16 Aug 2015 16:45:12 -0500 Subject: 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 Reviewed-by: Norbert Thiebaud --- cppcanvas/source/mtfrenderer/implrenderer.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cppcanvas/source') diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 54358fb23c6b..c536b7f4731e 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1547,7 +1547,7 @@ namespace cppcanvas case MetaActionType::GRADIENT: { MetaGradientAction* pGradAct = static_cast(pCurrAct); - createGradientAction( ::Polygon( pGradAct->GetRect() ), + createGradientAction( ::tools::Polygon( pGradAct->GetRect() ), pGradAct->GetGradient(), rFactoryParms, true, @@ -2009,9 +2009,9 @@ namespace cppcanvas case MetaActionType::ARC: { // TODO(F1): Missing basegfx functionality. Mind empty rects! - const Polygon aToolsPoly( static_cast(pCurrAct)->GetRect(), - static_cast(pCurrAct)->GetStartPoint(), - static_cast(pCurrAct)->GetEndPoint(), POLY_ARC ); + const ::tools::Polygon aToolsPoly( static_cast(pCurrAct)->GetRect(), + static_cast(pCurrAct)->GetStartPoint(), + static_cast(pCurrAct)->GetEndPoint(), POLY_ARC ); ::basegfx::B2DPolygon aPoly( aToolsPoly.getB2DPolygon() ); aPoly.transform( rStates.getState().mapModeTransform ); @@ -2023,9 +2023,9 @@ namespace cppcanvas case MetaActionType::PIE: { // TODO(F1): Missing basegfx functionality. Mind empty rects! - const Polygon aToolsPoly( static_cast(pCurrAct)->GetRect(), - static_cast(pCurrAct)->GetStartPoint(), - static_cast(pCurrAct)->GetEndPoint(), POLY_PIE ); + const ::tools::Polygon aToolsPoly( static_cast(pCurrAct)->GetRect(), + static_cast(pCurrAct)->GetStartPoint(), + static_cast(pCurrAct)->GetEndPoint(), POLY_PIE ); ::basegfx::B2DPolygon aPoly( aToolsPoly.getB2DPolygon() ); aPoly.transform( rStates.getState().mapModeTransform ); @@ -2037,9 +2037,9 @@ namespace cppcanvas case MetaActionType::CHORD: { // TODO(F1): Missing basegfx functionality. Mind empty rects! - const Polygon aToolsPoly( static_cast(pCurrAct)->GetRect(), - static_cast(pCurrAct)->GetStartPoint(), - static_cast(pCurrAct)->GetEndPoint(), POLY_CHORD ); + const ::tools::Polygon aToolsPoly( static_cast(pCurrAct)->GetRect(), + static_cast(pCurrAct)->GetStartPoint(), + static_cast(pCurrAct)->GetEndPoint(), POLY_CHORD ); ::basegfx::B2DPolygon aPoly( aToolsPoly.getB2DPolygon() ); aPoly.transform( rStates.getState().mapModeTransform ); -- cgit