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/xoutdev/_xpoly.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/xoutdev/_xpoly.cxx')
| -rw-r--r-- | svx/source/xoutdev/_xpoly.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index da4abd4c1b13..cea38481999f 100644 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -198,7 +198,7 @@ XPolygon::XPolygon( const XPolygon& rXPoly ) } /// create a XPolygon out of a standard polygon -XPolygon::XPolygon( const Polygon& rPoly ) +XPolygon::XPolygon( const tools::Polygon& rPoly ) { sal_uInt16 nSize = rPoly.GetSize(); @@ -862,7 +862,7 @@ basegfx::B2DPolygon XPolygon::getB2DPolygon() const // here. This needs one more conversion but avoids different convertors in // the long run DBG_ASSERT(pImpXPolygon != 0, "XPolygon::getB2DPolygon(): XPolygon has no implementation incarnated (!)"); - const Polygon aSource(GetPointCount(), pImpXPolygon->pPointAry, pImpXPolygon->pFlagAry); + const tools::Polygon aSource(GetPointCount(), pImpXPolygon->pPointAry, pImpXPolygon->pFlagAry); return aSource.getB2DPolygon(); } @@ -873,7 +873,7 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon) // here. This needs one more conversion but avoids different convertors in // the long run - const Polygon aSource(rPolygon); + const tools::Polygon aSource(rPolygon); sal_uInt16 nSize = aSource.GetSize(); pImpXPolygon = new ImpXPolygon( nSize ); pImpXPolygon->nPoints = nSize; |