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 /xmloff | |
| 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 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/draw/ximp3dobject.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index da6785be767c..2a838049342c 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -764,8 +764,8 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } case XmlShapeTypeDrawPolyPolygonShape: // closed PolyPolygon case XmlShapeTypeDrawPolyLineShape: // open PolyPolygon - case XmlShapeTypeDrawClosedBezierShape: // closed PolyPolygon containing curves - case XmlShapeTypeDrawOpenBezierShape: // open PolyPolygon containing curves + case XmlShapeTypeDrawClosedBezierShape: // closed tools::PolyPolygon containing curves + case XmlShapeTypeDrawOpenBezierShape: // open tools::PolyPolygon containing curves { ImpExportPolygonShape(xShape, aShapeInfo.meShapeType, nFeatures, pRefPoint ); break; @@ -3532,7 +3532,7 @@ void XMLShapeExport::ImpExport3DShape( case XmlShapeTypeDraw3DLatheObject: case XmlShapeTypeDraw3DExtrudeObject: { - // write special 3DLathe/3DExtrude attributes, get 3D PolyPolygon as drawing::PolyPolygonShape3D + // write special 3DLathe/3DExtrude attributes, get 3D tools::PolyPolygon as drawing::PolyPolygonShape3D aAny = xPropSet->getPropertyValue("D3DPolyPolygon3D"); drawing::PolyPolygonShape3D xPolyPolygon3D; aAny >>= xPolyPolygon3D; @@ -3542,7 +3542,7 @@ void XMLShapeExport::ImpExport3DShape( basegfx::tools::UnoPolyPolygonShape3DToB3DPolyPolygon( xPolyPolygon3D)); - // convert to 2D PolyPolygon using identity 3D transformation (just grep X and Y) + // convert to 2D tools::PolyPolygon using identity 3D transformation (just grep X and Y) const basegfx::B3DHomMatrix aB3DHomMatrixFor2DConversion; const basegfx::B2DPolyPolygon aPolyPolygon( basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon( diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 623584dccb8f..ef4002e1cfe4 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -354,7 +354,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa // set parameters if(!maPoints.isEmpty() && !maViewBox.isEmpty()) { - // import 2d PolyPolygon from svg:d + // import 2d tools::PolyPolygon from svg:d basegfx::B2DPolyPolygon aPolyPolygon; if(basegfx::tools::importFromSvgD(aPolyPolygon, maPoints, GetImport().needFixPositionAfterZ(), 0)) @@ -377,7 +377,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa } else { - OSL_ENSURE(false, "Error on importing svg:d for 3D PolyPolygon (!)"); + OSL_ENSURE(false, "Error on importing svg:d for 3D tools::PolyPolygon (!)"); } } |