summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-03-23 17:46:43 +0100
committerPetr Mladek <pmladek@suse.cz>2012-03-26 16:44:00 +0200
commit60a291d006890bc539d5cd19d03a930628d7d756 (patch)
treed94c1a053470cefeb697c49c2989d057f8167ca8
parent5ce6fc0ff62c8a1dbe6ae22300639ccb1d4900ba (diff)
Fix fdo#47406 incorrect relative moves after closePath
I missed the fact that odf export still uses the old exporter in xmloff/source/draw/xexptran.cxx, which was not fixed wrt. the update of current position in basegfx/source/polygon/b2dsvgpolypolygon.cxx Conflicts: xmloff/source/draw/xexptran.cxx Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch> Signed-off-by: Michael Meeks <michael.meeks@suse.com> Signed-off-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--xmloff/source/draw/xexptran.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 98fb45afc741..a2c46fedadc9 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1607,6 +1607,7 @@ void SdXMLImExSvgDElement::AddPolygon(
// bezier poly, handle curves
bool bDidWriteStart(false);
+ sal_Int32 nStartX(0), nStartY(0);
for(sal_Int32 a(0L); a < nCnt; a++)
{
@@ -2081,6 +2082,8 @@ void SdXMLImExSvgDElement::AddPolygon(
// remember start written
bDidWriteStart = true;
+ nStartX = nX;
+ nStartY = nY;
}
// remember new last position
@@ -2101,6 +2104,13 @@ void SdXMLImExSvgDElement::AddPolygon(
aNewString += String(sal_Unicode('z'));
else
aNewString += String(sal_Unicode('Z'));
+
+ // update current point - we're back at the start
+ if( bDidWriteStart )
+ {
+ mnLastX = nStartX;
+ mnLastY = nStartY;
+ }
}
// append new string