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 /svx/source/svdraw | |
| 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 'svx/source/svdraw')
| -rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpoev.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 81ad4d8bd0d7..b102d42a15a3 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1376,7 +1376,7 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const { bool bOtherObjs(false); // true=objects other than PathObj's existent - bool bMin1PolyPoly(false); // true=at least 1 PolyPolygon with more than one Polygon existent + bool bMin1PolyPoly(false); // true=at least 1 tools::PolyPolygon with more than one Polygon existent SdrObjList* pOL = pObj->GetSubList(); if(pOL) diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 76539b6f064b..2e2c039052e7 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1250,7 +1250,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const if(nSize > 1) { // the topology for contour is correctly a vector of PolyPolygons; for - // historical reasons cut it back to a single PolyPolygon here + // historical reasons cut it back to a single tools::PolyPolygon here for(sal_uInt32 a(0); a < nSize; a++) { aRetval.append(rResult[a]); @@ -2528,7 +2528,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas // check for fill rsults if(!aExtractedLineFills.empty()) { - // merge to a single PolyPolygon (OR) + // merge to a single tools::PolyPolygon (OR) aMergedLineFillPolyPolygon = basegfx::tools::mergeToSinglePolyPolygon(aExtractedLineFills); } } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index fcd5b0a5a7d6..2d9394db6b2c 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -484,7 +484,7 @@ bool SdrPolyEditView::IsOpenCloseMarkedObjectsPossible() const { // #i76617# Do not yet use basegfx::B2DPolygon since curve definitions // are different and methods need to be changed thoroughly with interaction rework - const PolyPolygon aPathPolyPolygon(pMarkedPathObject->GetPathPoly()); + const tools::PolyPolygon aPathPolyPolygon(pMarkedPathObject->GetPathPoly()); const sal_uInt16 nPolygonCount(aPathPolyPolygon.Count()); for(sal_uInt16 b(0); !bRetval && b < nPolygonCount; b++) |