[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 94ca682d70afc707c4c560e7a4a62546ae7c5669
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Sep 21 19:14:01 2012 +0200

    fdo#49655 fix RTF import of text in the middle of table definition
    
    Usually table text comes after the \intbl control word, but it turns out
    text is allowed earlier. Make sure such text is buffered, otherwise
    we'll send paragraph / run properties to the dmapper in the middle of
    table properties, which is obviously not allowed.
    
    (cherry picked from commit af6b7d8ba30d395e5f4a17876526434cf0a06005)
    
    Change-Id: I34f1df7e171316a7d926179689627301860d492f
    Reviewed-on: https://gerrit.libreoffice.org/689
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 35d42c7..2d918f4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -991,6 +991,14 @@ void RTFDocumentImpl::text(OUString& rString)
         return;
     }
 
+    // Are we in the middle of the table definition? (No cell defs yet, but we already have some cell props.)
+    if (m_aStates.top().aTableCellSprms.find(NS_ooxml::LN_CT_TcPrBase_vAlign).get() &&
+        m_aStates.top().nCells == 0)
+    {
+        m_aTableBuffer.push_back(make_pair(BUFFER_UTEXT, RTFValue::Pointer_t(new RTFValue(rString))));
+        return;
+    }
+
     checkFirstRun();
     checkNeedPap();