From 57d254d42b6e1d836bd21e6fb2e968af2b511c7d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Apr 2015 09:49:16 +0200 Subject: [PATCH] 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 --- sw/qa/core/data/ooxml/pass/fill.docx | Bin 0 -> 12619 bytes writerfilter/source/ooxml/model.xml | 6 ------ 2 files changed, 6 deletions(-) create mode 100644 sw/qa/core/data/ooxml/pass/fill.docx 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 0000000000000000000000000000000000000000..b9a4501b2854020210529eb2da35780485883323 GIT binary patch literal 12619 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 literal 0 HcmV?d00001 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 @@ - - - - - -