mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#42151 fix RTF import of vertically merged table cells

Browse Source 
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:
Miklos Vajna
2012-01-09 14:58:42 +01:00
parent 534e87c5d5
commit 7ec8f13d3a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -2734,6 +2734,7 @@ int RTFDocumentImpl::popState()
bool bFaltEnd = false; bool bFaltEnd = false;
RTFFrame aFrame; RTFFrame aFrame;
bool bPopFrame = false; bool bPopFrame = false;
RTFParserState aState(m_aStates.top());
if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE) if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE)
{ {
@@ -3148,6 +3149,12 @@ int RTFDocumentImpl::popState()
m_pCurrentBuffer = 0; m_pCurrentBuffer = 0;
m_bHasFootnote = false; 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; return 0;
} }