From f0860625e29c18d2eca647a6cedd0ce679d5a80d Mon Sep 17 00:00:00 2001 From: Sourav Date: Thu, 24 Apr 2014 18:18:16 +0530 Subject: [PATCH] fdo#77719 File containing CusGeom gets corrupted on RT. RT file gets corrupted because in presetgeometry tag shapetype is coming as blank. A check is introduced to handle that. Reviewed on: https://gerrit.libreoffice.org/9147 Change-Id: Ie79db0f5dcadfa3cd5d3f54d4a676393b3a882c5 --- sw/qa/extras/ooxmlexport/data/fdo77719.docx | Bin 0 -> 16680 bytes sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 8 ++++++++ sw/source/filter/ww8/docxsdrexport.cxx | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 sw/qa/extras/ooxmlexport/data/fdo77719.docx diff --git a/sw/qa/extras/ooxmlexport/data/fdo77719.docx b/sw/qa/extras/ooxmlexport/data/fdo77719.docx new file mode 100644 index 0000000000000000000000000000000000000000..e671b33f4e766b9ce6e4d4217f87b642368b6a09 GIT binary patch literal 16680 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 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index cc04809835e2..06182df566d5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -1105,6 +1105,14 @@ DECLARE_OOXMLEXPORT_TEST(testShapeEffectPreservation, "shape-effect-preservation "val", "50000"); } +DECLARE_OOXMLEXPORT_TEST(fdo77719, "fdo77719.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[2]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:prstGeom[1]", "prst", "rect"); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 5c5d5a233dcb..563e124a9b23 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -1164,6 +1164,9 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame* pParentFrame, int nAnchorId) } } } + //Empty shapeType will lead to corruption so to avoid that shapeType is set to default i.e. "rect" + if (shapeType.isEmpty()) + shapeType = "rect"; pFS->singleElementNS(XML_a, XML_prstGeom, XML_prst, OUStringToOString(shapeType, RTL_TEXTENCODING_UTF8).getStr(),