[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

Caolán McNamara caolan at kemper.freedesktop.org
Tue Jun 5 07:31:39 PDT 2012


 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41bb183bfb366d04817b4c2522e12936d473d99c
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Jun 1 16:30:06 2012 +0200

    fdo#50539 fix RTF import of automatic character background color
    
    Change-Id: I7efb3bce9a3a6f6c029d99de2264e00bb1bc7c93
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

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);


More information about the Libreoffice-commits mailing list