[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-7' - sd/source

[Caolán McNamara]

 sd/source/filter/eppt/pptx-epptooxml.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ea630582a143a76b2d7103de341acc019116993
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 14 17:05:10 2015 +0100

    fix export of ooo120353-1.odp to pptx, mismatch of start and end element
    
    cut and paste error I guess from the block above it
    
    (cherry picked from commit 1d4e66a79453f7b020a3dcea328c03637407add9)
    Reviewed-on: https://gerrit.libreoffice.org/15309
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit f9ac39aa8418745f959bc4daa0877fed23fc72c1)
    
    Change-Id: I121e1d1a9f08ea3731bb7f65c385f264b3c2d2f4
    Reviewed-on: https://gerrit.libreoffice.org/15430
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 980befa2..2cb61d5 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1093,7 +1093,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
         WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild );
     } else
         WriteAnimationCondition( pFS, aAny, false, bMainSeqChild );
-    pFS->endElementNS( XML_p, XML_stCondLst );
+    pFS->endElementNS( XML_p, XML_endCondLst );
     }
 
     Reference< XEnumerationAccess > xEnumerationAccess( rXNode, UNO_QUERY );