[Libreoffice-commits] core.git: filter/source sw/qa

[Miklos Vajna]

 filter/source/msfilter/util.cxx             |    1 -
 sw/qa/extras/ooxmlexport/data/fdo73215.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx    |   11 +++++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 096ea63090b137ac52cb75bf4b53dcef31962d44
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 2 15:44:11 2014 +0100

    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

diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index bf5648d..efe8cd1 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -772,7 +772,6 @@ static const CustomShapeTypeTranslationTable pCustomShapeTypeTranslationTable[]
     { "bang", "irregularSeal2" },
     { "lightning", "lightningBolt" },
     { "heart", "heart" },
-    { "mso-spt75", "pictureFrame" },
     { "quad-arrow", "quadArrow" },
     { "left-arrow-callout", "leftArrowCallout" },
     { "right-arrow-callout", "rightArrowCallout" },
diff --git a/sw/qa/extras/ooxmlexport/data/fdo73215.docx b/sw/qa/extras/ooxmlexport/data/fdo73215.docx
new file mode 100644
index 0000000..9b2c05b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo73215.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 54042d4..7e1b91d 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");