summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2011-12-27 00:00:33 +0100
committerMiklos Vajna <vmiklos@frugalware.org>2011-12-27 00:00:33 +0100
commite71d6df4137515f928d87375e404459cf9f310be (patch)
treea57abb7a6d2eba7bbc226b3f2b91a13726738842
parente4e77861c6a42d040230f4b1ca22ad5e8c3d52a2 (diff)
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.
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx3
1 files changed, 2 insertions, 1 deletions
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: