Kaydet (Commit) 969c1d5e authored tarafından Caolán McNamara's avatar Caolán McNamara

avoid assert on re-export of rhbz972256-3.docx to docx

something of a bodge I guess

Change-Id: I6d804ac1f6142da50bbfd4bb72d6b3e7edfbe441
üst 4dd32120
...@@ -6004,6 +6004,13 @@ void DocxAttributeOutput::CharColor( const SvxColorItem& rColor ) ...@@ -6004,6 +6004,13 @@ void DocxAttributeOutput::CharColor( const SvxColorItem& rColor )
aColorString = msfilter::util::ConvertColor( aColor ); 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() ); AddToAttrList( m_pColorAttrList, FSNS( XML_w, XML_val ), aColorString.getStr() );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment