diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-11-24 11:33:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-24 20:28:57 +0000 |
| commit | d74f3f2a1b98fbcba9e5490b6d790fa40d8b863d (patch) | |
| tree | 5813b88ce7c86ac007171cc0c19850d4df4f52ba /writerfilter | |
| parent | 493ecf8f17185bbd9ffe1ac9c58791da6d23b0d9 (diff) | |
fdo#85889 handle pc, pca and mac rtf keywords in writerfilter
(cherry picked from commit 7839633fb356285652ed96f4bf3f85bcd5b561a4)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Ic54f2233a37562bdc516e440af0b4b7973f56342
Reviewed-on: https://gerrit.libreoffice.org/13106
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 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a8d88f3119db..27e0ab227452 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2830,6 +2830,18 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_ANSI: m_aStates.top().nCurrentEncoding = RTL_TEXTENCODING_MS_1252; break; + case RTF_MAC: + m_nCurrentEncoding = RTL_TEXTENCODING_APPLE_ROMAN; + m_aStates.top().nCurrentEncoding = m_nCurrentEncoding; + break; + case RTF_PC: + m_nCurrentEncoding = RTL_TEXTENCODING_IBM_437; + m_aStates.top().nCurrentEncoding = m_nCurrentEncoding; + break; + case RTF_PCA: + m_nCurrentEncoding = RTL_TEXTENCODING_IBM_850; + m_aStates.top().nCurrentEncoding = m_nCurrentEncoding; + break; case RTF_PLAIN: { m_aStates.top().aCharacterSprms = getDefaultState().aCharacterSprms; |