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

handle run properties in draw text

Browse source
This commit is contained in:
Miklos Vajna 2011-07-05 21:41:44 +02:00
parent a6ca3eccd2
commit 61ff3c5a42
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -985,7 +985,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
{
if (!m_pCurrentBuffer)
parBreak();
else
else if (m_aStates.top().nDestinationState != DESTINATION_SHAPETEXT)
{
RTFValue::Pointer_t pValue;
m_pCurrentBuffer->push_back(make_pair(BUFFER_PAR, pValue));
@ -2145,7 +2145,8 @@ int RTFDocumentImpl::pushState()
m_aStates.top().nDestinationState = DESTINATION_FONTENTRY;
else if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET)
m_aStates.top().nDestinationState = DESTINATION_STYLEENTRY;
else if (m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT)
else if (m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT ||
m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT)
m_aStates.top().nDestinationState = DESTINATION_NORMAL;
else if (m_aStates.top().nDestinationState == DESTINATION_REVISIONTABLE)
m_aStates.top().nDestinationState = DESTINATION_REVISIONENTRY;