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

[Samuel Mehrbrodt]

 xmloff/source/draw/animationexport.cxx |   59 +++++++++++++++------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

New commits:
commit b223028d65d24ffcd8e27974c29c2744a5df6227
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Fri Nov 11 13:07:08 2016 +0100

    This condition has been checked before
    
    Change-Id: I8a2d4f3cce3e286432a100f82b5d22f588fb95b8
    Reviewed-on: https://gerrit.libreoffice.org/30773
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index a2aae4d..c8cba9f 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -668,45 +668,42 @@ void AnimationsExporterImpl::exportTransitionNode()
 
             SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_PAR, true, true );
 
-            if( nTransition != 0 )
-            {
-                sal_Int16 nSubtype = 0;
-                bool bDirection = false;
-                sal_Int32 nFadeColor = 0;
-                double fDuration = 0.0;
-                mxPageProps->getPropertyValue("TransitionSubtype") >>= nSubtype;
-                mxPageProps->getPropertyValue("TransitionDirection") >>= bDirection;
-                mxPageProps->getPropertyValue("TransitionFadeColor") >>= nFadeColor;
-                mxPageProps->getPropertyValue("TransitionDuration") >>= fDuration;
-
-                ::sax::Converter::convertDouble( sTmp, fDuration );
-                sTmp.append( 's');
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
+            sal_Int16 nSubtype = 0;
+            bool bDirection = false;
+            sal_Int32 nFadeColor = 0;
+            double fDuration = 0.0;
+            mxPageProps->getPropertyValue("TransitionSubtype") >>= nSubtype;
+            mxPageProps->getPropertyValue("TransitionDirection") >>= bDirection;
+            mxPageProps->getPropertyValue("TransitionFadeColor") >>= nFadeColor;
+            mxPageProps->getPropertyValue("TransitionDuration") >>= fDuration;
+
+            ::sax::Converter::convertDouble( sTmp, fDuration );
+            sTmp.append( 's');
+            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DUR, sTmp.makeStringAndClear() );
 
-                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
-                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
+            SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nTransition, getAnimationsEnumMap(Animations_EnumMap_TransitionType) );
+            mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_TYPE, sTmp.makeStringAndClear() );
 
-                if( nSubtype != TransitionSubType::DEFAULT )
-                {
-                    SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
-                }
+            if( nSubtype != TransitionSubType::DEFAULT )
+            {
+                SvXMLUnitConverter::convertEnum( sTmp, (sal_uInt16)nSubtype, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) );
+                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_SUBTYPE, sTmp.makeStringAndClear() );
+            }
 
-                if( !bDirection )
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, XML_REVERSE );
+            if( !bDirection )
+                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_DIRECTION, XML_REVERSE );
 
-                if( (nTransition == TransitionType::FADE) && ((nSubtype == TransitionSubType::FADETOCOLOR) || (nSubtype == TransitionSubType::FADEFROMCOLOR) ))
-                {
-                    ::sax::Converter::convertColor( sTmp, nFadeColor );
-                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );
-                }
-                SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, true, true );
+            if( (nTransition == TransitionType::FADE) && ((nSubtype == TransitionSubType::FADETOCOLOR) || (nSubtype == TransitionSubType::FADEFROMCOLOR) ))
+            {
+                ::sax::Converter::convertColor( sTmp, nFadeColor );
+                mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );
             }
+            SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, true, true );
 
             if( bStopSound )
             {
                 mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, XML_STOP_AUDIO );
-                SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
+                SvXMLElementExport aElement3( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
             }
             else if( !sSoundURL.isEmpty())
             {
@@ -718,7 +715,7 @@ void AnimationsExporterImpl::exportTransitionNode()
 
                 if( bLoopSound )
                     mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE );
-                SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
+                SvXMLElementExport aElement4( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
             }
         }
     }