diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-04 22:45:48 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-06 12:52:06 +0000 |
| commit | f6ca0bb117fd31a61f2eac06187c0f41ba95a768 (patch) | |
| tree | a7409bd06c2a38af52f7d3400f87a7067062884b /writerfilter | |
| parent | e963f4ee14fdda118a54745dcfca46e6244f0999 (diff) | |
fdo#85812: RTF import: fix run type in new groups
Apparently the run type resets to LTR in a new group.
(regression from fc49c052dbdbb5ab3b0a02a13143705f769b9662)
(cherry picked from commit 88d3f9e4cf64e4ef037063b26ddf347fd42d8d84)
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
(cherry picked from commit a9a9718bb1f64318429562ecdaa3d3763d9e2f4a)
Reviewed-on: https://gerrit.libreoffice.org/12269
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 145fd4a3d67f..6c6e282f9845 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4770,6 +4770,9 @@ 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()); |