summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdtrans.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2015-08-16 16:45:12 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2015-08-17 02:07:43 +0000
commitef46917ff3163d3fdd5152bda5d16c4503b6ab69 (patch)
tree73271cd339b19964bc91157207565595774e98b5 /svx/source/svdraw/svdtrans.cxx
parent2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2 (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/svdtrans.cxx')
-rw-r--r--svx/source/svdraw/svdtrans.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 424cb91892d7..66a5fb8d9b1b 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -59,7 +59,7 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con
}
-void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
+void ResizePoly(tools::Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
sal_uInt16 nCount=rPoly.GetSize();
for (sal_uInt16 i=0; i<nCount; i++) {
@@ -75,7 +75,7 @@ void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, cons
}
}
-void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs)
+void RotatePoly(tools::Polygon& rPoly, const Point& rRef, double sn, double cs)
{
sal_uInt16 nCount=rPoly.GetSize();
for (sal_uInt16 i=0; i<nCount; i++) {
@@ -133,7 +133,7 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
}
}
-void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2)
+void MirrorPoly(tools::Polygon& rPoly, const Point& rRef1, const Point& rRef2)
{
sal_uInt16 nCount=rPoly.GetSize();
for (sal_uInt16 i=0; i<nCount; i++) {
@@ -149,7 +149,7 @@ void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2)
}
}
-void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear)
+void ShearPoly(tools::Polygon& rPoly, const Point& rRef, double tn, bool bVShear)
{
sal_uInt16 nCount=rPoly.GetSize();
for (sal_uInt16 i=0; i<nCount; i++) {
@@ -480,9 +480,9 @@ void GeoStat::RecalcTan()
-Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo)
+tools::Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo)
{
- Polygon aPol(5);
+ tools::Polygon aPol(5);
aPol[0]=rRect.TopLeft();
aPol[1]=rRect.TopRight();
aPol[2]=rRect.BottomRight();
@@ -493,7 +493,7 @@ Polygon Rect2Poly(const Rectangle& rRect, const GeoStat& rGeo)
return aPol;
}
-void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
+void Poly2Rect(const tools::Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
{
rGeo.nRotationAngle=GetAngle(rPol[1]-rPol[0]);
rGeo.nRotationAngle=NormAngle360(rGeo.nRotationAngle);