From e0a0b6e8294aa5fcdfb36e5f38783486db0f0b2a Mon Sep 17 00:00:00 2001 From: Mark Hung Date: Sun, 20 Nov 2016 01:39:37 +0800 Subject: tdf59046 oox: fix incorrectly combined shapes 1. Store the path of all polygons of a PolyPolygon in the same path element so it subtract overlapped area. 2. Set the size of the path as the bounding box of PolyPolygon so the points of the polygon scale and offset properly. Change-Id: If6e21d1ac0544b45ef68073cf14bcc08c1d7dbef Reviewed-on: https://gerrit.libreoffice.org/30982 Tested-by: Jenkins Reviewed-by: Mark Hung --- oox/source/export/drawingml.cxx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'oox/source') diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index deafd3477a7e..0951449950a3 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2556,16 +2556,19 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ) mpFS->startElementNS( XML_a, XML_pathLst, FSEND ); + const Rectangle aRect( rPolyPolygon.GetBoundRect() ); + + // Put all polygons of rPolyPolygon in the same path elemnt + // to subtract the overlapped areas. + mpFS->startElementNS( XML_a, XML_path, + XML_w, I64S( aRect.GetWidth() ), + XML_h, I64S( aRect.GetHeight() ), + FSEND ); + for( sal_uInt16 i = 0; i < rPolyPolygon.Count(); i ++ ) { const tools::Polygon& rPoly = rPolyPolygon[ i ]; - Rectangle aRect( rPoly.GetBoundRect() ); - - mpFS->startElementNS( XML_a, XML_path, - XML_w, I64S( aRect.GetWidth() ), - XML_h, I64S( aRect.GetHeight() ), - FSEND ); if( rPoly.GetSize() > 0 ) { @@ -2611,9 +2614,8 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ) mpFS->endElementNS( XML_a, XML_lnTo ); } } - - mpFS->endElementNS( XML_a, XML_path ); } + mpFS->endElementNS( XML_a, XML_path ); mpFS->endElementNS( XML_a, XML_pathLst ); -- cgit