From 7ec8f13d3ac0650c7e62e31220f1eda9d0a9284c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 9 Jan 2012 14:58:42 +0100 Subject: [PATCH] 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. --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 06fc047b45a5..6c8e8d7cd0bf 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2734,6 +2734,7 @@ int RTFDocumentImpl::popState() bool bFaltEnd = false; RTFFrame aFrame; bool bPopFrame = false; + RTFParserState aState(m_aStates.top()); if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE) { @@ -3148,6 +3149,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; }