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

[Caolán McNamara]

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

New commits:
commit ae8e571936dc83d54e398bfc21f5a512b8c7471b
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Apr 25 17:51:45 2012 +0200

    fdo#48037 fix RTF import of localized fields

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index fd57905..b74b26e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2198,6 +2198,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
     if (nSprm > 0)
     {
         m_aStates.top().aCharacterSprms->push_back(make_pair(nSprm, pIntValue));
+        // Language is a character property, but we should store it at a paragraph level as well for fields.
+        if (nKeyword == RTF_LANG && m_bNeedPap)
+            m_aStates.top().aParagraphSprms->push_back(make_pair(nSprm, pIntValue));
         return 0;
     }
     // Trivial paragraph sprms.