summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-04-30 09:49:16 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-30 10:15:50 +0200
commit57d254d42b6e1d836bd21e6fb2e968af2b511c7d (patch)
tree238808efd31e486098566a036c8d1b5178422057
parentf365cd8754839d6608ba4750e46fb277b5f3df26 (diff)
writerfilter: unused fill and CT_Fill resources
These were added by commit cfc4650c8594334edecc3b50ca54461f6bee2d43 (Added some teaks to 'model.xml', 2014-09-16), but the matching dmapper part is missing, so they aren't useful in practice, and cause a crash on import of crashtest's File_953.docx. Change-Id: I3d1c138534a37dc9ba500f1134ca4bb9ebae0e96
-rw-r--r--sw/qa/core/data/ooxml/pass/fill.docxbin0 -> 12619 bytes
-rw-r--r--writerfilter/source/ooxml/model.xml6
2 files changed, 0 insertions, 6 deletions
diff --git a/sw/qa/core/data/ooxml/pass/fill.docx b/sw/qa/core/data/ooxml/pass/fill.docx
new file mode 100644
index 000000000000..b9a4501b2854
--- /dev/null
+++ b/sw/qa/core/data/ooxml/pass/fill.docx
Binary files differ
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index d6fb8c5e6993..df0ae0e5b5e0 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -9449,12 +9449,6 @@
<resource name="background" resource="Properties">
<element name="background" tokenid="ooxml:background_background"/>
</resource>
- <resource name="fill" resource="Properties">
- <element name="fill" tokenid="ooxml:fill_fill"/>
- </resource>
- <resource name="CT_Fill" resource="Properties">
- <attribute name="type" tokenid="ooxml:CT_Fill_type"/>
- </resource>
</namespace>
<namespace name="vml-officeDrawing">
<start name="shapedefaults"/>