diff options
| -rw-r--r-- | xmloff/inc/xexptran.hxx | 8 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/draw/xexptran.cxx | 12 |
3 files changed, 17 insertions, 11 deletions
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx index a22f7ad37332..578a229bbaae 100644 --- a/xmloff/inc/xexptran.hxx +++ b/xmloff/inc/xexptran.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xexptran.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2001-02-26 10:23:28 $ + * last change: $Author: aw $ $Date: 2002-01-08 15:41:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,9 @@ public: const SdXMLImExViewBox& rViewBox, const com::sun::star::awt::Point& rObjectPos, const com::sun::star::awt::Size& rObjectSize, - const SvXMLUnitConverter& rConv); + const SvXMLUnitConverter& rConv, + // #96328# + const sal_Bool bClosed = sal_True); SdXMLImExPointsElement(const rtl::OUString& rNew, const SdXMLImExViewBox& rViewBox, const com::sun::star::awt::Point& rObjectPos, diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index ebfb0a164116..baeaafbf7b37 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeexport2.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: sab $ $Date: 2001-12-10 17:42:16 $ + * last change: $Author: aw $ $Date: 2002-01-08 15:42:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -948,7 +948,9 @@ void XMLShapeExport::ImpExportPolygonShape( drawing::PointSequence* pSequence = pSourcePolyPolygon->getArray(); if(pSequence) { - SdXMLImExPointsElement aPoints(pSequence, aViewBox, aPoint, aSize, rExport.GetMM100UnitConverter()); + SdXMLImExPointsElement aPoints(pSequence, aViewBox, aPoint, aSize, rExport.GetMM100UnitConverter(), + // #96328# + bClosed); // write point array rExport.AddAttribute(XML_NAMESPACE_DRAW, XML_POINTS, aPoints.GetExportString()); diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 46449bed87a1..8d943489f3d8 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xexptran.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: aw $ $Date: 2001-06-14 15:20:24 $ + * last change: $Author: aw $ $Date: 2002-01-08 15:43:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1233,7 +1233,9 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints, const SdXMLImExViewBox& rViewBox, const awt::Point& rObjectPos, const awt::Size& rObjectSize, - const SvXMLUnitConverter& rConv) + const SvXMLUnitConverter& rConv, + // #96328# + const sal_Bool bClosed) : maPoly( 0L ) { // add polygon to string @@ -1242,8 +1244,8 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints, awt::Point* pArray = pPoints->getArray(); // last point same? Ignore it. - if((pArray->X == (pArray + (nCnt - 1))->X) - && (pArray->Y == (pArray + (nCnt - 1))->Y)) + // #96328# ...but only when polygon is CLOSED + if(bClosed && (pArray->X == (pArray + (nCnt - 1))->X) && (pArray->Y == (pArray + (nCnt - 1))->Y)) nCnt--; // object size and ViewBox size different? |