diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-28 13:22:56 +0300 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-01-28 23:43:25 +0100 |
| commit | d7d27ce1788fa6dab98639626fd3b856c0ae6b37 (patch) | |
| tree | 2333e23f39f2c662ad96480ea264ff99379e0b8d /sw | |
| parent | e65aeb1c9fdc84e6b0645bea067cdbe2de28a052 (diff) | |
tdf#130214: workaround invalid state resulting from error on import
Obviously the real error is somewhere else, which results in tdf#126435,
and produces unexpected state with missing text append context on stack.
This is just a hack to avoid crash.
Change-Id: I420ac3b74f5efb9688dc764ac2ad0dcc974ba0e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87595
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit eca00082c78fddf79f247057227404738be8806c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87635
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf130214.docx | bin | 0 -> 23057 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 5 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf130214.docx b/sw/qa/extras/ooxmlimport/data/tdf130214.docx Binary files differnew file mode 100644 index 000000000000..4344e1c6e44e --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf130214.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx index 2a250a898cf2..28d62e4811db 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx @@ -460,6 +460,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf103345, "numbering-circle.docx") } } +DECLARE_OOXMLIMPORT_TEST(testTdf130214, "tdf130214.docx") +{ + // Currently this file imports with errors because of tdf#126435; it must not segfault on load +} + // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT CPPUNIT_PLUGIN_IMPLEMENT(); |