Kaydet (Commit) f3f98b8e authored tarafından Tamás Zolnai's avatar Tamás Zolnai

tdf#111838: Revert "Decrease duplicated code"

This reverts commit 787732fa.

Change-Id: Idd36f0d434c5ec867e0e1bbbfa70d8a4644d53c6
Reviewed-on: https://gerrit.libreoffice.org/41976Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst 92012cfa
......@@ -3034,7 +3034,6 @@ void DrawingML::WriteShapeEffect( const OUString& sName, const Sequence< Propert
if( nEffectToken > 0 )
{
mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
mpFS->startElement( nEffectToken, xOuterShdwAttrList );
if( bContainsColor )
......@@ -3046,7 +3045,6 @@ void DrawingML::WriteShapeEffect( const OUString& sName, const Sequence< Propert
}
mpFS->endElement( nEffectToken );
mpFS->endElementNS(XML_a, XML_effectLst);
}
}
......@@ -3090,17 +3088,23 @@ void DrawingML::WriteShapeEffects( const Reference< XPropertySet >& rXPropSet )
aShadowGrabBag[2].Name = "RgbClrTransparency";
aShadowGrabBag[2].Value = rXPropSet->getPropertyValue( "ShadowTransparence" );
mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
WriteShapeEffect( "outerShdw", aShadowGrabBag );
mpFS->endElementNS(XML_a, XML_effectLst);
}
return;
}
mpFS->startElementNS(XML_a, XML_effectLst, FSEND);
for( sal_Int32 i=0; i < aEffects.getLength(); ++i )
{
Sequence< PropertyValue > aEffectProps;
aEffects[i].Value >>= aEffectProps;
WriteShapeEffect( aEffects[i].Name, aEffectProps );
}
mpFS->endElementNS(XML_a, XML_effectLst);
}
void DrawingML::WriteShape3DEffects( const Reference< XPropertySet >& xPropSet )
......
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