summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-05-23 07:30:26 (GMT)
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-05-23 07:45:45 (GMT)
commite6300f83d08fd959596551dcd660eb0fbfb248a6 (patch)
tree028905929a0f873ac443a9892bddc8a5842b9928
parentfa017a3e503cc654b8756e1056feb1ee98225310 (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
-rw-r--r--oox/source/drawingml/textbodycontext.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 28b56e4..69b2396 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;