writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 52b6ab689bbeb2611af84b694a98282e58426345
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri Sep 28 17:45:21 2012 +0200
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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2d918f4..45e1920 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
