[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svtools/source

[Libreoffice Gerrit user]

 svtools/source/filter/wmf/winmtf.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit b740f2aeff67278c6f1741088a9be25aa823a8aa
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Nov 21 01:12:08 2012 +0100

    Fix fdo#57353 correct moveTo handling for emf path recording
    
    A moveTo following an existing path really should create a new
    subpath, not add to the existing one. It's the equivalent of lifting
    the pen.
    
    Change-Id: I196ca9435f8b4225837add964aec7afceb1d6d88
    Reviewed-on: https://gerrit.libreoffice.org/1147
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/filter/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx
index 2968ec1..fe4a461 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -1112,7 +1112,13 @@ void WinMtfOutput::MoveTo( const Point& rPoint, sal_Bool bRecordPath )
 {
     Point aDest( ImplMap( rPoint ) );
     if ( bRecordPath )
+    {
+        // fdo#57353 create new subpath for subsequent moves
+        if ( aPathObj.Count() )
+            if ( aPathObj[ aPathObj.Count() - 1 ].GetSize() )
+                aPathObj.Insert( Polygon(), POLYPOLY_APPEND );
         aPathObj.AddPoint( aDest );
+    }
     maActPos = aDest;
 }