diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-26 11:33:11 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-01-27 00:20:00 +0100 |
| commit | 24759eb260e85bdbc90a47155a6578a6d6c088fa (patch) | |
| tree | 596be46e815fe54218a015476430e91a7ae50fe8 /writerfilter | |
| parent | 3205bbedfbc8cc76125eb53acc1e6281748f5876 (diff) | |
RTF import: fix handling of font color from paragraph style
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I6bbad2d69863020ea870be800f49e13e763b80bf
Reviewed-on: https://gerrit.libreoffice.org/7667
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'writerfilter')
| -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 da6ce92fd5da..2097b05b8bd7 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2921,9 +2921,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: |