diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-28 07:51:19 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-30 11:47:41 +0200 |
commit | c9d4a2887c13a5df244022276dd79a5bef8af0ea (patch) | |
tree | fb849270affd5fca01fa26094c89595d18c6f588 /basegfx | |
parent | d17d4d48b5dc3332fd03f6ef186ed2bda4665e7c (diff) |
fdo#82577: Handle PolyPolygon
Put the TOOLS PolyPolygon class in the tools namespace. Avoids clash with the Windows
PolyPolygon typedef.
Change-Id: I811ecbb3d55ba4ce66e4555a8586f60fcd57fb66
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/source/polygon/b2dlinegeometry.cxx | 2 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolygonclipper.cxx | 4 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dpolygontools.cxx | 2 | ||||
-rw-r--r-- | basegfx/source/polygon/b2dtrapezoid.cxx | 2 | ||||
-rw-r--r-- | basegfx/source/tools/unotools.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx index 7d99fea243c8..78a722b092d8 100644 --- a/basegfx/source/polygon/b2dlinegeometry.cxx +++ b/basegfx/source/polygon/b2dlinegeometry.cxx @@ -47,7 +47,7 @@ namespace basegfx { B2DPolyPolygon aRetval; OSL_ENSURE(rCandidate.count() > 1L, "createAreaGeometryForLineStartEnd: Line polygon has too less points (!)"); - OSL_ENSURE(rArrow.count() > 0L, "createAreaGeometryForLineStartEnd: Empty arrow PolyPolygon (!)"); + OSL_ENSURE(rArrow.count() > 0L, "createAreaGeometryForLineStartEnd: Empty arrow tools::PolyPolygon (!)"); OSL_ENSURE(fWidth > 0.0, "createAreaGeometryForLineStartEnd: Width too small (!)"); OSL_ENSURE(fDockingPosition >= 0.0 && fDockingPosition <= 1.0, "createAreaGeometryForLineStartEnd: fDockingPosition out of range [0.0 .. 1.0] (!)"); diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx index c9f1587634e1..7dc42139b927 100644 --- a/basegfx/source/polygon/b2dpolygonclipper.cxx +++ b/basegfx/source/polygon/b2dpolygonclipper.cxx @@ -474,7 +474,7 @@ namespace basegfx else { // use common aIntersectionRange as result, convert - // to expected PolyPolygon form + // to expected tools::PolyPolygon form return basegfx::B2DPolyPolygon( basegfx::tools::createPolygonFromRect(aIntersectionRange)); } @@ -489,7 +489,7 @@ namespace basegfx // Also get rid of some not-needed polygons (neutral, no area -> when // no intersections, these are tubes). // Now it is possible to correct the orientations in the cut-free - // polygons to values corresponding to painting the PolyPolygon with + // polygons to values corresponding to painting the tools::PolyPolygon with // a XOR-WindingRule. aMergePolyPolygonA = solveCrossovers(aMergePolyPolygonA); aMergePolyPolygonA = stripNeutralPolygons(aMergePolyPolygonA); diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx index 8b5c9540e406..3c5f80d470f4 100644 --- a/basegfx/source/polygon/b2dpolygontools.cxx +++ b/basegfx/source/polygon/b2dpolygontools.cxx @@ -3449,7 +3449,7 @@ namespace basegfx OSL_ENSURE(com::sun::star::drawing::PolygonFlags_CONTROL != ePolygonFlag && bControlA == bControlB, "UnoPolygonBezierCoordsToB2DPolygon: Illegal source polygon (!)"); - // the previous writes used the B2DPolyPoygon -> PolyPolygon converter + // the previous writes used the B2DPolyPoygon -> tools::PolyPolygon converter // which did not create minimal PolyPolygons, but created all control points // as null vectors (identical points). Because of the former P(CA)(CB)-norm of // B2DPolygon and it's unused sign of being the zero-vector and CA and CB being diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx index b49f3c6cd1de..3b80c0bc1bd7 100644 --- a/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/basegfx/source/polygon/b2dtrapezoid.cxx @@ -944,7 +944,7 @@ namespace basegfx { namespace tools { - // convert Source PolyPolygon to trapezoids + // convert Source tools::PolyPolygon to trapezoids void trapezoidSubdivide(B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon) { trapezoidhelper::TrapezoidSubdivider aTrapezoidSubdivider(rSourcePolyPolygon); diff --git a/basegfx/source/tools/unotools.cxx b/basegfx/source/tools/unotools.cxx index c1c5044070be..f5b1e273b8f4 100644 --- a/basegfx/source/tools/unotools.cxx +++ b/basegfx/source/tools/unotools.cxx @@ -110,7 +110,7 @@ namespace unotools if(drawing::PolygonFlags_CONTROL == ePolyFlag || bControlA != bControlB) throw lang::IllegalArgumentException(); - // the previous writes used the B2DPolyPoygon -> PolyPolygon converter + // the previous writes used the B2DPolyPoygon -> tools::PolyPolygon converter // which did not create minimal PolyPolygons, but created all control points // as null vectors (identical points). Because of the former P(CA)(CB)-norm of // B2DPolygon and it's unused sign of being the zero-vector and CA and CB being |