diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-10 09:32:41 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-10 10:51:25 +0100 |
| commit | f5985685ddc519f760a7324fa60fd662f25404c1 (patch) | |
| tree | f42295076ed485b31ae03590458298e4bc269b24 | |
| parent | 49c3aff8d8d3030b2acbffb6ff000b5d44445cc9 (diff) | |
DOCX strict import: handle SmartArt
Change-Id: I8c45f3153eafe882f3d9ee3be533c3c0e673527e
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/strict.docx | bin | 18110 -> 25423 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/strict.docx b/sw/qa/extras/ooxmlimport/data/strict.docx Binary files differindex de71c3b6686b..8586f37bf3e7 100644 --- a/sw/qa/extras/ooxmlimport/data/strict.docx +++ b/sw/qa/extras/ooxmlimport/data/strict.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 1b147a700f74..8c7d97a14ed3 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1922,8 +1922,12 @@ DECLARE_OOXMLIMPORT_TEST(testStrict, "strict.docx") uno::Reference<lang::XServiceInfo> xServiceInfo(getShape(1), uno::UNO_QUERY); CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextGraphicObject")); - // Chart was missing. + // SmartArt was missing. xServiceInfo.set(getShape(2), uno::UNO_QUERY); + CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.drawing.GroupShape")); + + // Chart was missing. + xServiceInfo.set(getShape(3), uno::UNO_QUERY); CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextEmbeddedObject")); } diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 513902b78ff8..97e9cfac9df6 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -30,6 +30,7 @@ <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/picture" alias="picture" id="dmlPicture"/> <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/picture" alias="picture" id="dmlPicture"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/diagram" alias="diagram" id="dmlDiagram"/> + <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/diagram" alias="diagram" id="dmlDiagram"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" alias="lockedCanvas" id="dmlLockedCanvas"/> <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" alias="wps" id="wps"/> <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" alias="wpg" id="wpg"/> |