diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-10 10:10:21 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-10 10:51:26 +0100 |
| commit | d795fb224e52c66c4585ed1e079a2b7601a07eda (patch) | |
| tree | 6401a65a67ddfe115b9073ab2872470d2185082d | |
| parent | f5985685ddc519f760a7324fa60fd662f25404c1 (diff) | |
DOCX strict import: handle lockedCanvas
Change-Id: I44c936a8972e1ae101aeab62ace61f4470d92b34
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx | bin | 0 -> 12345 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx b/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx Binary files differnew file mode 100644 index 000000000000..d31be7e92035 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 8c7d97a14ed3..d09631be31c9 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1931,6 +1931,12 @@ DECLARE_OOXMLIMPORT_TEST(testStrict, "strict.docx") CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextEmbeddedObject")); } +DECLARE_OOXMLIMPORT_TEST(testStrictLockedcanvas, "strict-lockedcanvas.docx") +{ + // locked canvas shape was missing. + getShape(1); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 97e9cfac9df6..12936ba9fa47 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -32,6 +32,7 @@ <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://purl.oclc.org/ooxml/drawingml/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"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/chart" alias="chart" id="dmlChart"/> |