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/svdotxtr.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/svdotxtr.cxx')
-rw-r--r-- | svx/source/svdraw/svdotxtr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index fca3331358c8..ae88eb6afb0b 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -143,7 +143,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract } else { - Polygon aPol(Rect2Poly(maRect,aGeo)); + tools::Polygon aPol(Rect2Poly(maRect,aGeo)); for(sal_uInt16 a(0); a < aPol.GetSize(); a++) { @@ -153,7 +153,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract if(bXMirr != bYMirr) { // turn polygon and move it a little - Polygon aPol0(aPol); + tools::Polygon aPol0(aPol); aPol[0] = aPol0[1]; aPol[1] = aPol0[0]; @@ -229,7 +229,7 @@ void SdrTextObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea SetGlueReallyAbsolute(true); // when this is a SdrPathObj, aRect may be uninitialized - Polygon aPol(Rect2Poly(maRect.IsEmpty() ? GetSnapRect() : maRect, aGeo)); + tools::Polygon aPol(Rect2Poly(maRect.IsEmpty() ? GetSnapRect() : maRect, aGeo)); sal_uInt16 nPointCount=aPol.GetSize(); for (sal_uInt16 i=0; i<nPointCount; i++) { @@ -256,14 +256,14 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) std::abs(rRef1.X()-rRef2.X())==std::abs(rRef1.Y()-rRef2.Y()))) { bRota90Merk=aGeo.nRotationAngle % 9000 ==0; } - Polygon aPol(Rect2Poly(maRect,aGeo)); + tools::Polygon aPol(Rect2Poly(maRect,aGeo)); sal_uInt16 i; sal_uInt16 nPointCount=aPol.GetSize(); for (i=0; i<nPointCount; i++) { MirrorPoint(aPol[i],rRef1,rRef2); } // turn polygon and move it a little - Polygon aPol0(aPol); + tools::Polygon aPol0(aPol); aPol[0]=aPol0[1]; aPol[1]=aPol0[0]; aPol[2]=aPol0[3]; |