diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-04 14:18:33 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-04 14:30:25 +0200 |
commit | 866a4436d3cfac1ff42d7996250bf96fb703aeaa (patch) | |
tree | eed8851d3640cfa8b69ca1a08cdf397e2d765f47 /osx | |
parent | 10ec4a7cb24da8ced86880bbceeca4d2ad3436f1 (diff) |
oox: handle textboxes in ShapeContextHandler::endFastElement()
DOCX shape import normally works by oox creating the shape, then
writerfilter handling the shape text. For drawingML shapes, having shape
text, this a bit more complicated, as there are shape properties after
the shape text as well.
ShapeContextHandler::endFastElement() assumed that shape text is only
possible on css.text.TextFrame shapes: also handle shapes having a
TextBox as well.
sw/qa/extras/ooxmlimport/data/mce-nested.docx is a reproducer for this
problem (group shape missing), when TextBoxes are enabled by default in
oox.
Change-Id: I7a412b31965cf363da0b0c7fcc732741f2037542
Diffstat (limited to 'osx')
0 files changed, 0 insertions, 0 deletions