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

[Tamás Zolnai]

 oox/source/export/drawingml.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 787732fac0aef255bdc51479fdaddf15532d118e
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Mon Aug 14 06:11:14 2017 +0200

    Decrease duplicated code
    
    Change-Id: Icadb800c8c31649a8db3da68ff6e9761a8f4d916
    Reviewed-on: https://gerrit.libreoffice.org/41128
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0110f4c24875..aec1aaecc6a5 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3021,6 +3021,7 @@ 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 )
@@ -3032,6 +3033,7 @@ void DrawingML::WriteShapeEffect( const OUString& sName, const Sequence< Propert
         }
 
         mpFS->endElement( nEffectToken );
+        mpFS->endElementNS(XML_a, XML_effectLst);
     }
 }
 
@@ -3075,23 +3077,17 @@ 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 )