diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-23 09:30:26 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-08 13:46:21 +0200 |
| commit | a14daabc24cd1a40815dc76f799c11b7796971e8 (patch) | |
| tree | 90fedb5b76f8580d6b2a4c0d9a55295eb6cc09ff /oox | |
| parent | 1b92c8bae498b7c59c6a074744c3f29512d05411 (diff) | |
DOCX import: recurse into w:ins in groupshape text
Groupshape text is provided by editeng, redlining is available in Writer
text only. But still, instead of ignoring both deletions and insertions
in group shape text, we could at least show the latest version
correctly, i.e. ignore deletions but import insertions.
Change-Id: I12df2ca1a8d27f9496a8036e521f8820d7075053
(cherry picked from commit e6300f83d08fd959596551dcd660eb0fbfb248a6)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textbodycontext.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx index 9821149cf98c..5d9bd6aa3cd3 100644 --- a/oox/source/drawingml/textbodycontext.cxx +++ b/oox/source/drawingml/textbodycontext.cxx @@ -90,6 +90,13 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken case OOX_TOKEN( doc, sdt ): case OOX_TOKEN( doc, sdtContent ): return this; + case OOX_TOKEN( doc, del ): + break; + case OOX_TOKEN( doc, ins ): + return this; + break; + default: + SAL_WARN("oox", "TextParagraphContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken)); } return 0; |