From e71d6df4137515f928d87375e404459cf9f310be Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Tue, 27 Dec 2011 00:00:33 +0100
Subject: [PATCH] Related: fdo#43380 fix parsing of the \cf RTF token

Send the real color value to dmapper, not the index, which is
meaningless outside the tokenizer.
---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4c9f8a3b5efe..de1195bf9282 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2057,7 +2057,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
         case RTF_CF:
             {
                 // NS_sprm::LN_CIco won't work, that would be an index in a static table
-                m_aStates.top().aCharacterAttributes->push_back(make_pair(NS_ooxml::LN_CT_Color_val, pIntValue));
+                RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
+                m_aStates.top().aCharacterAttributes->push_back(make_pair(NS_ooxml::LN_CT_Color_val, pValue));
             }
             break;
         case RTF_S: