mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#77719 File containing CusGeom gets corrupted on RT.

Browse Source 
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
This commit is contained in:
Sourav 2014-04-24 18:18:16 +05:30 committed by Miklos Vajna
parent d6904736b9
commit f0860625e2
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlexport/data/fdo77719.docx Normal file
View File

Binary file not shown.

8
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
View File

@ -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();

3
sw/source/filter/ww8/docxsdrexport.cxx
View File

@ -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(),