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

[Miklos Vajna]

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

New commits:
commit 00a2444e051aaa2495b20a651f3ae096b4ff3cad
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Mon Jan 9 14:58:42 2012 +0100

    fdo#42151 fix RTF import of vertically merged table cells
    
    The problem was that \row took care of states (which is right, since
    \trowd wants to reset row properties to the default state), but it
    should not respect state pops.
    (cherry picked from commit 7ec8f13d3ac0650c7e62e31220f1eda9d0a9284c)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 02a6cef..25c2e2d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2744,6 +2744,7 @@ int RTFDocumentImpl::popState()
     bool bFaltEnd = false;
     RTFFrame aFrame;
     bool bPopFrame = false;
+    RTFParserState aState(m_aStates.top());
 
     if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE)
     {
@@ -3158,6 +3159,12 @@ int RTFDocumentImpl::popState()
         m_pCurrentBuffer = 0;
         m_bHasFootnote = false;
     }
+    if (m_aStates.size())
+    {
+        m_aStates.top().nCells = aState.nCells;
+        m_aStates.top().aTableCellsSprms = aState.aTableCellsSprms;
+        m_aStates.top().aTableCellsAttributes = aState.aTableCellsAttributes;
+    }
 
     return 0;
 }