diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-05 18:46:29 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-05 18:59:59 +0100 |
| commit | a9a9718bb1f64318429562ecdaa3d3763d9e2f4a (patch) | |
| tree | 83cb492f70fed0d91c5903903a7c1f3e2eb9977b /writerfilter | |
| parent | 33b5b467224fef8d99ba3f6f4cba3d404119c100 (diff) | |
fdo#85812: RTF import: better fix for run type in new groups
Apparently Word treats \ltrch \rtlch differently from
\loch \hich \dbch when groups are opened.
Change-Id: I257712521e8e77fa66e76857489797ecc675506e
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 99693f3fe564..a568d954d548 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4823,13 +4823,14 @@ int RTFDocumentImpl::pushState() m_aStates.push(m_aDefaultState); else { + // fdo#85812 group resets run type of _current_ and new state (but not RTL) + m_aStates.top().eRunType = RTFParserState::LOCH; + if (m_aStates.top().nDestinationState == DESTINATION_MR) lcl_DestinationToMath(*m_aStates.top().pDestinationText, m_aMathBuffer, m_bMathNor); m_aStates.push(m_aStates.top()); } m_aStates.top().aDestinationText.setLength(0); // was copied: always reset! - m_aStates.top().isRightToLeft = false; // fdo#85812 group resets run type - m_aStates.top().eRunType = RTFParserState::LOCH; m_pTokenizer->pushGroup(); |