diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-28 17:45:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-01 10:33:27 +0000 |
| commit | 52b6ab689bbeb2611af84b694a98282e58426345 (patch) | |
| tree | 732922bce56261708f3461d3baeb79bd454227ff /writerfilter | |
| parent | 5b536e72f2a4e35275eb33317ec6b6e14845b75c (diff) | |
fdo#52475 fix import of RTF_CHCBPAT with value 0
0 means auto, and for fdo#50539, this value was ignored. However a next
sample shows that we should send something to the dmapper: COL_AUTO.
Change-Id: I8d7d35125c9027dfb45288bbfbfa81ba4799e78d
Reviewed-on: https://gerrit.libreoffice.org/740
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 2d918f44e7fa..45e1920c9ea5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2449,9 +2449,8 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) m_aDefaultState.aCharacterSprms.set(NS_sprm::LN_CLidBi, pIntValue); break; case RTF_CHCBPAT: - if (nParam) { - RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam))); + RTFValue::Pointer_t pValue(new RTFValue(nParam ? getColorTable(nParam) : COL_AUTO)); lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue); } break; |