diff options
| author | nrbrtx@gmail.com <nrbrtx@gmail.com> | 2014-06-10 12:26:26 +0400 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-08 19:30:57 +0000 |
| commit | 22731ba9e15978ab1d1ed98a29d88431cf674257 (patch) | |
| tree | d552386dc8ec6d056fc35788fa9926153fcacdde /writerfilter | |
| parent | aae8f8a758f42fec1189d5a8eed5e89c6c388cd0 (diff) | |
fdo#79599: use \highlightN instead of \chcbpatN in RTF import and export
Reviewed on:
https://gerrit.libreoffice.org/9776
(cherry picked from commit 7eafd8ccac56d7503b4287dfa3acac2cf0560b20)
Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx
Change-Id: I98ef606fb73368a3c275819cb83b936e2162769d
Reviewed-on: https://gerrit.libreoffice.org/10813
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 35ad80e921e2..d97f4715417e 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1336,6 +1336,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nColor )); else if (mnBackgroundColor) rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( mnBackgroundColor )); + else + rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nIntValue )); } break; case NS_ooxml::LN_EG_RPrBase_em: diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 19172761c0fa..37afecce0b77 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3743,7 +3743,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; case RTF_HIGHLIGHT: { - RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam))); + RTFValue::Pointer_t pValue(new RTFValue(nParam ? getColorTable(nParam) : COL_AUTO)); m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_RPrBase_highlight, pValue); } break; |