diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-01-14 23:01:41 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-01-24 16:54:40 +0100 |
| commit | 43232c398e75df015f8c12687e780fd412370c0a (patch) | |
| tree | 15f9b2a6aee4660a2a140efc22b8ced394989ece /sw | |
| parent | de3efc6f0940f753d3bdf36a493697df9f4b44e5 (diff) | |
rhbz#1180114: writerfilter: don't crash on w:customXmlDelRangeStart etc.
We can't do anything sensible with these CustomXML elements but now we
have to handle them because.
(regression from 9dbf817fe5c5253fba0831aefa17575ae0ba3af1)
Change-Id: If4247890ff9961a77434587802670d28608a7922
(cherry picked from commit f22964e0e622af1168e241f933e5cf98e093ec2b)
Reviewed-on: https://gerrit.libreoffice.org/13914
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/rhbz1180114.docx | bin | 0 -> 3435 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/rhbz1180114.docx b/sw/qa/extras/ooxmlimport/data/rhbz1180114.docx Binary files differnew file mode 100644 index 000000000000..23009ebbdc82 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/rhbz1180114.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 008200958116..44876b907c0b 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -728,6 +728,11 @@ DECLARE_OOXMLIMPORT_TEST(testN779834, "n779834.docx") // This document simply crashed the importer. } +DECLARE_OOXMLIMPORT_TEST(testRHBZ1180114, "rhbz1180114.docx") +{ + // This document simply crashed the importer. +} + DECLARE_OOXMLIMPORT_TEST(testN779627, "n779627.docx") { /* |