diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-02 15:44:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-02 16:20:26 +0100 |
| commit | 096ea63090b137ac52cb75bf4b53dcef31962d44 (patch) | |
| tree | 6e708ea970b46f956dd044504d5361f334b32ea6 /sw/qa | |
| parent | dad7fe7227fb80a32d3c2c777584dc9d74b9e929 (diff) | |
fdo#73215 filter: don't try to handle pictureFrame in GetOOXMLPresetGeometry()
"pictureFrame" is not a valid drawingML shape type, VML export used to
write just "rect", by removing an explicit entry for
ESCHER_ShpInst_PictureFrame we now do the same.
Change-Id: I57683b7f5f80bfef8c3b6fb9ae9f33e4599a7eb2
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/fdo73215.docx | bin | 0 -> 17846 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/fdo73215.docx b/sw/qa/extras/ooxmlexport/data/fdo73215.docx Binary files differnew file mode 100644 index 000000000000..9b2c05b72032 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/fdo73215.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 54042d4493d8..7e1b91d51c73 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -136,6 +136,7 @@ xmlNodeSetPtr Test::getXPathNode(xmlDocPtr pXmlDoc, const OString& rXPath) xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("v"), BAD_CAST("urn:schemas-microsoft-com:vml")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("mc"), BAD_CAST("http://schemas.openxmlformats.org/markup-compatibility/2006")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wps"), BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordprocessingShape")); + xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wpg"), BAD_CAST("http://schemas.microsoft.com/office/word/2010/wordprocessingGroup")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("wp"), BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("a"), BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/main")); xmlXPathObjectPtr pXmlXpathObj = xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx); @@ -2183,6 +2184,16 @@ DECLARE_OOXMLEXPORT_TEST(testBezier, "bezier.odt") CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDraws->getCount()); } +DECLARE_OOXMLEXPORT_TEST(testFdo73215, "fdo73215.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + // 'rect' was 'pictureFrame', which isn't valid. + assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:spPr/a:prstGeom", + "prst", "rect"); +} + DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, "testTrackChangesDeletedParagraphMark.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); |