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

[Miklos Vajna]

 sw/qa/core/data/ooxml/pass/fill.docx |binary
 writerfilter/source/ooxml/model.xml  |    6 ------
 2 files changed, 6 deletions(-)

New commits:
commit 57d254d42b6e1d836bd21e6fb2e968af2b511c7d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 30 09:49:16 2015 +0200

    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

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 0000000..b9a4501
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fill.docx differ
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index d6fb8c5..df0ae0e 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"/>