summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2012-01-09 14:58:42 +0100
committerMiklos Vajna <vmiklos@frugalware.org>2012-01-09 15:13:59 +0100
commit7ec8f13d3ac0650c7e62e31220f1eda9d0a9284c (patch)
tree081797ceda04b34236ec1d472d686fec8e3d4c85
parent534e87c5d5edb84f7ee98e1db6c18446afd5cbcb (diff)
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.
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx7
1 files changed, 7 insertions, 0 deletions
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;
}