mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oox: Code protection against empty effects

Browse Source 
This is an extra check against clumsy programmers like me to prevent
generating incorrect documents.

Change-Id: I22261e3b6123a9a44461683519e33224f08adb5a
This commit is contained in:
Jacobo Aragunde Pérez
2014-04-30 12:14:02 +02:00
parent 2310af2366
commit ae4e79e772
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
oox/source/export/drawingml.cxx
View File

@@ -2251,20 +2251,23 @@ void DrawingML::WriteShapeEffects( Reference< XPropertySet > rXPropSet )
}
}
mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
sax_fastparser::XFastAttributeListRef xAttrList( aOuterShdwAttrList );
mpFS->startElement( nEffectToken, xAttrList );
if( bContainsColor )
if( nEffectToken > 0 )
{
if( sSchemeClr.isEmpty() )
WriteColor( nRgbClr, nAlpha );
else
WriteColor( sSchemeClr, aTransformations );
}
mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
sax_fastparser::XFastAttributeListRef xAttrList( aOuterShdwAttrList );
mpFS->startElement( nEffectToken, xAttrList );
mpFS->endElement( nEffectToken );
mpFS->endElementNS(XML_a, XML_effectLst);
if( bContainsColor )
{
if( sSchemeClr.isEmpty() )
WriteColor( nRgbClr, nAlpha );
else
WriteColor( sSchemeClr, aTransformations );
}
mpFS->endElement( nEffectToken );
mpFS->endElementNS(XML_a, XML_effectLst);
}
}
}