[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source

[Libreoffice Gerrit user]

 sd/source/filter/eppt/pptx-epptooxml.cxx |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 44653e1909593058799e1235b208b41a45955bda
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Sep 12 15:13:05 2012 +0200

    Revert "avoid writing empty p:childTnLst elements, fixes rest of fdo#41992"
    
    This reverts commit b962b31a4e6709c5bf3d44e185f9f838de2051e2.

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 23be9b8..dd36bd7 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1127,17 +1127,16 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
     if( xEnumeration.is() ) {
         DBG(printf ("-----\n"));
 
-        if( xEnumeration->hasMoreElements() ) {
-            pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
+        pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
 
-            while( xEnumeration->hasMoreElements() ) {
-                Reference< XAnimationNode > xChildNode( xEnumeration->nextElement(), UNO_QUERY );
-                if( xChildNode.is() )
-                    WriteAnimationNode( pFS, xChildNode, nType == EffectNodeType::MAIN_SEQUENCE );
-            }
-
-            pFS->endElementNS( XML_p, XML_childTnLst );
+        while( xEnumeration->hasMoreElements() ) {
+        Reference< XAnimationNode > xChildNode( xEnumeration->nextElement(), UNO_QUERY );
+        if( xChildNode.is() )
+            WriteAnimationNode( pFS, xChildNode, nType == EffectNodeType::MAIN_SEQUENCE );
         }
+
+        pFS->endElementNS( XML_p, XML_childTnLst );
+
         DBG(printf ("-----\n"));
     }
     }