[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

[Petr Mladek]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8054472f666c87d6437dcea064c3cef379916245
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Aug 10 17:48:57 2012 +0200

    fdo#48446 implement RTF_CPG
    
    (cherry picked from commit f6a24ace5ad12e79f0cc90709a290a30e3758781)
    
    Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2074d69..1355501 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2373,6 +2373,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
         case RTF_ANSICPG:
             m_aStates.top().nCurrentEncoding = rtl_getTextEncodingFromWindowsCodePage(nParam);
             break;
+        case RTF_CPG:
+            m_aFontEncodings[m_nCurrentFontIndex] = rtl_getTextEncodingFromWindowsCodePage(nParam);
+            break;
         case RTF_CF:
             {
                 // NS_sprm::LN_CIco won't work, that would be an index in a static table