strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RTF_CELL should alter the cell definition list outside its current group

Browse source
This commit is contained in:
Miklos Vajna 2011-06-22 13:12:28 +02:00
parent 61f9a54b21
commit 37da7aa99a
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View file

@ -677,6 +677,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
Mapper().props(pTableCellProperties);
m_aStates.top().aTableCellsAttributes.pop_front();
m_aStates.top().aTableCellsSprms.pop_front();
m_aStates.top().nTableCellPops++;
}
if (nKeyword == RTF_CELL)
@ -1660,6 +1661,7 @@ int RTFDocumentImpl::popState()
std::vector<std::pair<rtl::OUString, rtl::OUString>> aShapeProperties;
bool bPopShapeProperties = false;
bool bPicPropEnd = false;
int nTableCellPops = 0;
if (m_aStates.top().nDestinationState == DESTINATION_FONTTABLE)
{
@ -1773,6 +1775,7 @@ int RTFDocumentImpl::popState()
}
if (m_aStates.top().nDestinationState == DESTINATION_NESTEDTABLEPROPERTIES)
m_aBuffer.clear();
nTableCellPops = m_aStates.top().nTableCellPops;
m_aStates.pop();
@ -1811,6 +1814,13 @@ int RTFDocumentImpl::popState()
m_aStates.top().aShapeProperties = aShapeProperties;
else if (bPicPropEnd)
resolveShapeProperties(aShapeProperties);
for (int i = 0; i < nTableCellPops; ++i)
{
if (m_aStates.top().aTableCellsAttributes.size())
m_aStates.top().aTableCellsAttributes.pop_front();
if (m_aStates.top().aTableCellsSprms.size())
m_aStates.top().aTableCellsSprms.pop_front();
}
return 0;
}
@ -1979,7 +1989,8 @@ RTFParserState::RTFParserState()
aShapeProperties(),
nCellX(0),
aTableCellsSprms(),
aTableCellsAttributes()
aTableCellsAttributes(),
nTableCellPops(0)
{
}

2
writerfilter/source/rtftok/rtfdocumentimpl.hxx
View file

@ -151,6 +151,8 @@ namespace writerfilter {
int nCellX;
std::deque<RTFSprms::Pointer_t> aTableCellsSprms;
std::deque<RTFSprms::Pointer_t> aTableCellsAttributes;
/// Number of cell definitions which should be popped after leaving the current group.
int nTableCellPops;
};
/// Implementation of the RTFDocument interface.