diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-26 11:33:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-26 11:50:59 +0100 |
| commit | aeb1e8fd92a5622be1476e25eba6477b29ff1273 (patch) | |
| tree | 5bbbb7bffa01e6a84d52239a674f08304e2fc5eb /writerfilter/source | |
| parent | 512d8f049530b944ee5f693e34db27797dc2756b (diff) | |
RTF import: fix handling of font color from paragraph style
Change-Id: I6bbad2d69863020ea870be800f49e13e763b80bf
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9653a21b2835..e42f9d0a1571 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3008,9 +3008,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; case RTF_CF: { + RTFSprms aAttributes; // NS_sprm::LN_CIco won't work, that would be an index in a static table RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam))); - m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_Color_val, pValue); + aAttributes.set(NS_ooxml::LN_CT_Color_val, pValue); + m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_RPrBase_color, RTFValue::Pointer_t(new RTFValue(aAttributes))); } break; case RTF_S: |