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 /svx/source/svdraw/svdoashp.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 'svx/source/svdraw/svdoashp.cxx')
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 22d699be4d55..b12a68dfac5f 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1810,7 +1810,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() if ( aGeo.nRotationAngle || nShearAngle || bMirroredX || bMirroredY ) { - Polygon aPoly( maRect ); + tools::Polygon aPoly( maRect ); if( nShearAngle ) { sal_uInt16 nPointCount=aPoly.GetSize(); @@ -3104,7 +3104,7 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf if ( bMirroredX ) { - Polygon aPol = Rect2Poly(maRect, aNewGeo); + tools::Polygon aPol = Rect2Poly(maRect, aNewGeo); Rectangle aBoundRect( aPol.GetBoundRect() ); Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() ); @@ -3116,7 +3116,7 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf MirrorPoint(aPol[i],aRef1,aRef2); } // mirror polygon and move it a bit - Polygon aPol0(aPol); + tools::Polygon aPol0(aPol); aPol[0]=aPol0[1]; aPol[1]=aPol0[0]; aPol[2]=aPol0[3]; @@ -3126,7 +3126,7 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf } if ( bMirroredY ) { - Polygon aPol( Rect2Poly( aRectangle, aNewGeo ) ); + tools::Polygon aPol( Rect2Poly( aRectangle, aNewGeo ) ); Rectangle aBoundRect( aPol.GetBoundRect() ); Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 ); @@ -3138,7 +3138,7 @@ bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf MirrorPoint(aPol[i],aRef1,aRef2); } // mirror polygon and move it a bit - Polygon aPol0(aPol); + tools::Polygon aPol0(aPol); aPol[0]=aPol0[1]; // This was WRONG for vertical (!) aPol[1]=aPol0[0]; // #i121932# Despite my own comment above aPol[2]=aPol0[3]; // it was *not* wrong even when the reordering |