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 /vcl/source/gdi/gdimetafiletools.cxx | |
| 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 'vcl/source/gdi/gdimetafiletools.cxx')
| -rw-r--r-- | vcl/source/gdi/gdimetafiletools.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index b0d99c54405a..745c9d6146f1 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -62,7 +62,7 @@ namespace { rTarget.AddAction( new MetaPolyLineAction( - Polygon(aResult.getB2DPolygon(a)))); + tools::Polygon(aResult.getB2DPolygon(a)))); } } else @@ -599,11 +599,11 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } else { - const Polygon aToolsPoly( - rRect, - pA->GetStartPoint(), - pA->GetEndPoint(), - POLY_ARC); + const tools::Polygon aToolsPoly( + rRect, + pA->GetStartPoint(), + pA->GetEndPoint(), + POLY_ARC); bDone = handleGeometricContent( aClips.back(), @@ -625,11 +625,11 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } else { - const Polygon aToolsPoly( - rRect, - pA->GetStartPoint(), - pA->GetEndPoint(), - POLY_PIE); + const tools::Polygon aToolsPoly( + rRect, + pA->GetStartPoint(), + pA->GetEndPoint(), + POLY_PIE); bDone = handleGeometricContent( aClips.back(), @@ -651,11 +651,11 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } else { - const Polygon aToolsPoly( - rRect, - pA->GetStartPoint(), - pA->GetEndPoint(), - POLY_CHORD); + const tools::Polygon aToolsPoly( + rRect, + pA->GetStartPoint(), + pA->GetEndPoint(), + POLY_CHORD); bDone = handleGeometricContent( aClips.back(), @@ -913,7 +913,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else if(rComment.equalsIgnoreAsciiCase("XPATHSTROKE_SEQ_BEGIN")) { SvtGraphicStroke aStroke; - Polygon aPath; + tools::Polygon aPath; { // read SvtGraphicFill SvMemoryStream aMemStm(const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(),StreamMode::READ); @@ -939,7 +939,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) // add clipped geometry for(sal_uInt32 a(0); a < aResult.count(); a++) { - aStroke.setPath(Polygon(aResult.getB2DPolygon(a))); + aStroke.setPath(tools::Polygon(aResult.getB2DPolygon(a))); addSvtGraphicStroke(aStroke, aTarget); } @@ -949,7 +949,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) else { // exchange with empty polygon - aStroke.setPath(Polygon()); + aStroke.setPath(tools::Polygon()); addSvtGraphicStroke(aStroke, aTarget); bDone = true; } |