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

[Libreoffice Gerrit user]

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

New commits:
commit b962b31a4e6709c5bf3d44e185f9f838de2051e2
Author: Radek Doulik <r...@novell.com>
Date:   Wed Aug 15 13:54:46 2012 +0200

    avoid writing empty p:childTnLst elements, fixes rest of fdo#41992
    
    Change-Id: Idc09103bb8e4dbd580b5ae53f7929b4700f2c818

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index dd36bd7..23be9b8 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1127,16 +1127,17 @@ void 
PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
     if( xEnumeration.is() ) {
         DBG(printf ("-----\n"));
 
-        pFS->startElementNS( XML_p, XML_childTnLst, FSEND );
+        if( xEnumeration->hasMoreElements() ) {
+            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"));
     }
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits