[REVIEW:3-5] fdo#50539 fix RTF import of automatic character background color

2012-06-05 Thread Miklos Vajna
Hi,

See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bbb849

A similar issue was already backported for paragraph background color,
this is the same, but for character backgrounds.

Thanks,

Miklos
From 697b6dea49d2ebbe1c1cf0b726ebd5647dea8519 Mon Sep 17 00:00:00 2001
From: Miklos Vajna vmik...@suse.cz
Date: Fri, 1 Jun 2012 16:30:06 +0200
Subject: [PATCH] fdo#50539 fix RTF import of automatic character background
 color

Change-Id: I7efb3bce9a3a6f6c029d99de2264e00bb1bc7c93
---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ea14c57..f76e1e2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2376,6 +2376,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
 m_aDefaultState.aCharacterSprms-push_back(make_pair(NS_sprm::LN_CLidBi, pIntValue));
 break;
 case RTF_CHCBPAT:
+if (nParam)
 {
 RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
 lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
-- 
1.7.7

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PUSHED][REVIEW:3-5] fdo#50539 fix RTF import of automatic character background color

2012-06-05 Thread Caolán McNamara
On Tue, 2012-06-05 at 16:27 +0200, Miklos Vajna wrote:
 Hi,
 
 See
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bbb849
 
 A similar issue was already backported for paragraph background color,
 this is the same, but for character backgrounds.

pushed to 3-5

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice