[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmloff/source

[Fridrich Strba]

 xmloff/source/draw/xexptran.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit db3597cef07a0f659be5617d9148069c7fb4a5a8
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Fri Mar 23 17:46:43 2012 +0100

    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

diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 98fb45a..a2c46fe 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