[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/docxattributeoutput.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 969c1d5e44ed11e08f64334ed65ce01d2fa54acb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 12 21:29:53 2015 +0100

    avoid assert on re-export of rhbz972256-3.docx to docx
    
    something of a bodge I guess
    
    Change-Id: I6d804ac1f6142da50bbfd4bb72d6b3e7edfbe441

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3b1ddc2..c92d111 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6004,6 +6004,13 @@ void DocxAttributeOutput::CharColor( const SvxColorItem& rColor )
 
     aColorString = msfilter::util::ConvertColor( aColor );
 
+    const char* pExistingValue(NULL);
+    if (m_pColorAttrList && m_pColorAttrList->getAsChar(FSNS(XML_w, XML_val), pExistingValue))
+    {
+        assert(aColorString.equalsL(pExistingValue, rtl_str_getLength(pExistingValue)));
+        return;
+    }
+
     AddToAttrList( m_pColorAttrList, FSNS( XML_w, XML_val ), aColorString.getStr() );
 }