summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-11-21 01:12:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-11-21 15:16:28 +0000
commitb740f2aeff67278c6f1741088a9be25aa823a8aa (patch)
tree33eac42d6ebe4bc2b9e5622709950d1f6265a731
parenta7ad12f2832c519fcef243c591fcccdc170874c0 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svtools/source/filter/wmf/winmtf.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/svtools/source/filter/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx
index 2968ec1ae276..fe4a46139cd1 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;
}