From c3d124254a3097163aae127e2fe3e34980417f20 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 29 Nov 2016 09:20:28 +0100 Subject: tdf#104115 DOCX export: ClosedBezierShape should always result in Regression from commit 6b084f0001fc15112bf3c40d20a0c7096c83b7fe (asan: global-buffer-overflow on fdo55736-1.docx, 2015-01-08), the problem as seen by the user was that our VML->DML conversion in a DOCX file resulted in output that wasn't accepted by Word anymore. Now that commit itself is fine, but as a side effect, the somewhat unusual (bezier with no actual polypolygons) child shape of the group shape is now written, but not in a way that conforms to the drawingML schema. Fix that pre-existing, but now visible problem by always writing in the DOCX case. (cherry picked from commit a5cc8993dceb61c63caf26ae995d9d62905291e5) Change-Id: Idbcb903dda07b5c2408d2b0ebbf4b5e4a08b20ed Reviewed-on: https://gerrit.libreoffice.org/31383 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- oox/source/export/drawingml.cxx | 4 +++- sw/qa/extras/ooxmlexport/data/tdf104115.docx | Bin 0 -> 13044 bytes sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf104115.docx diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 0951449950a3..8d0256594be4 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2540,7 +2540,9 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape ) void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon ) { - if( rPolyPolygon.Count() < 1 ) + // In case of Writer, the parent element is , and there the + // element is not optional. + if (rPolyPolygon.Count() < 1 && GetDocumentType() != DOCUMENT_DOCX) return; mpFS->startElementNS( XML_a, XML_custGeom, FSEND ); diff --git a/sw/qa/extras/ooxmlexport/data/tdf104115.docx b/sw/qa/extras/ooxmlexport/data/tdf104115.docx new file mode 100644 index 000000000000..9236f0e3a5c4 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf104115.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 8d117e675738..f4bd83e39f15 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -141,6 +141,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103982, "tdf103982.docx") CPPUNIT_ASSERT(nDistB >= 0); } +DECLARE_OOXMLEXPORT_TEST(testTdf104115, "tdf104115.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + // This found 0 nodes: the custom geometry was not written for the Bezier + // curve -> Word refused to open the document. + assertXPath(pXmlDoc, "//a:custGeom", 1); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3