[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

[Miklos Vajna]

 oox/source/drawingml/textbodycontext.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit a14daabc24cd1a40815dc76f799c11b7796971e8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri May 23 09:30:26 2014 +0200

    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)

diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 9821149..5d9bd6a 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;