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.
This commit is contained in:
parent
534e87c5d5
commit
7ec8f13d3a
1 changed files with 7 additions and 0 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue