From 61ff3c5a4202acab766873c25fb1bb47f0a25135 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 5 Jul 2011 21:41:44 +0200 Subject: [PATCH] handle run properties in draw text --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c1680c7b03cb..8f5a2f8dd5af 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -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;