diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:12:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-11-02 09:14:44 +0100 |
| commit | 4cae3689d4d78fabe6529c9df03c438b1e9d1611 (patch) | |
| tree | 5c00257b2765ac4f1ae66927efb949eed3d6f83f /sw/qa | |
| parent | sw: prefix members of SwViewOption (diff) | |
| download | core-4cae3689d4d78fabe6529c9df03c438b1e9d1611.tar.gz core-4cae3689d4d78fabe6529c9df03c438b1e9d1611.zip | |
tdf#89088 DOCX import: fix missing text due to throwing ShapeContextHandler
Regression from commit 866a4436d3cfac1ff42d7996250bf96fb703aeaa (oox:
handle textboxes in ShapeContextHandler::endFastElement(), 2014-06-04),
the problem was that code in ShapeContextHandler::endFastElement()
assumed that all the XShape implementation it may see provides a TextBox
UNO property (which is specific to Writer) of type bool, but this is not
true.
Fix the problem by assuming false in case it has an other type.
Testcase can be a simple "does it load" one, as in the meantime
exceptions such as trying to read a bool from an uno::Any make the DOCX
XFilter::filter() implementation return false, unlike in the originally
reported LibreOffice 4.4 version that just silently discarded the
remaining content of the document.
Change-Id: I81781a7ec28d085ceee50d386b8eda023f83c29f
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/core/data/ooxml/pass/tdf89088.docx | bin | 0 -> 28335 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/sw/qa/core/data/ooxml/pass/tdf89088.docx b/sw/qa/core/data/ooxml/pass/tdf89088.docx Binary files differnew file mode 100644 index 000000000000..fc6718569e31 --- /dev/null +++ b/sw/qa/core/data/ooxml/pass/tdf89088.docx |