Kaydet (Commit) b8a863a2 authored tarafından Jacobo Aragunde Pérez's avatar Jacobo Aragunde Pérez

drawingML: do not write empty schemeClr tags

Change-Id: I8508f00f6af218605d1d43d3efcefbf545387ab8
üst 2fcf3a87
...@@ -181,6 +181,10 @@ void DrawingML::WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha ) ...@@ -181,6 +181,10 @@ void DrawingML::WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha )
void DrawingML::WriteColor( OUString sColorSchemeName, Sequence< PropertyValue > aTransformations ) void DrawingML::WriteColor( OUString sColorSchemeName, Sequence< PropertyValue > aTransformations )
{ {
// prevent writing a tag with empty val attribute
if( sColorSchemeName.isEmpty() )
return;
if( aTransformations.hasElements() ) if( aTransformations.hasElements() )
{ {
mpFS->startElementNS( XML_a, XML_schemeClr, mpFS->startElementNS( XML_a, XML_schemeClr,
...@@ -219,17 +223,14 @@ void DrawingML::WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha ) ...@@ -219,17 +223,14 @@ void DrawingML::WriteSolidFill( OUString sSchemeName, sal_Int32 nAlpha )
mpFS->startElementNS( XML_a, XML_solidFill, FSEND ); mpFS->startElementNS( XML_a, XML_solidFill, FSEND );
if( nAlpha < MAX_PERCENT ) if( nAlpha < MAX_PERCENT )
{ {
mpFS->startElementNS( XML_a, XML_schemeClr, XML_val, Sequence< PropertyValue > aTransformations(1);
OUStringToOString( sSchemeName, RTL_TEXTENCODING_ASCII_US ).getStr(), aTransformations[0].Name = "alpha";
FSEND ); aTransformations[0].Value <<= nAlpha;
mpFS->singleElementNS( XML_a, XML_alpha, XML_val, OString::number(nAlpha), FSEND ); WriteColor( sSchemeName, aTransformations );
mpFS->endElementNS( XML_a, XML_schemeClr );
} }
else else
{ {
mpFS->singleElementNS( XML_a, XML_schemeClr, XML_val, WriteColor( sSchemeName );
OUStringToOString( sSchemeName, RTL_TEXTENCODING_ASCII_US ).getStr(),
FSEND );
} }
mpFS->endElementNS( XML_a, XML_solidFill ); mpFS->endElementNS( XML_a, XML_solidFill );
} }
......
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