[Libreoffice-commits] core.git: 3 commits - oox/source

[Miklos Vajna]

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

New commits:
commit e6300f83d08fd959596551dcd660eb0fbfb248a6
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

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;
commit fa017a3e503cc654b8756e1056feb1ee98225310
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri May 23 09:17:01 2014 +0200

    DOCX import: detect inline shape inside shape text
    
    Change-Id: Ia1614759558e73686fce137eb52fb623eae4a4e5

diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 1dd5a6c..28b56e4 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -146,6 +146,8 @@ ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToke
     case OOX_TOKEN( doc, t ):
         mbIsInText = true;
         break;
+    case OOX_TOKEN( doc, drawing ):
+        break;
     default:
         SAL_WARN("oox", "RegularTextRunContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken));
         break;
commit 86283cd75e798ce7fd5ca0e91ac3ea0733d31404
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri May 23 08:50:50 2014 +0200

    DOCX import: detect table in groupshape
    
    Change-Id: Iba7bb88139a97e919739363cd85f3e822062b694

diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 9821149..1dd5a6c 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -181,6 +181,8 @@ ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, con
     case OOX_TOKEN( doc, sdtPr ):
     case OOX_TOKEN( doc, sdtEndPr ):
         break;
+    case OOX_TOKEN( doc, tbl ):
+        break;
     default:
         SAL_WARN("oox", "TextBodyContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken));
     }