commit bdbec2daaaba5ab0a9456811d05c4b51431dc7a8
author Ivo Hinkelmann <ihi@openoffice.org> Mon Apr 16 12:09:41 2007 +0000
committer Ivo Hinkelmann <ihi@openoffice.org> Mon Apr 16 12:09:41 2007 +0000
tree 34371617745cfb4c3a4d5505b5fa39eabf40dc3b
parent eaf9c4ca23b05d44bb0a81aab5e977ce2403bee4

INTEGRATION: CWS impressrng01_SRC680 (1.10.64); FILE MERGED
2007/03/30 14:48:01 cl 1.10.64.2: #i67790# added import of smil:additive attribute and use 'base' as default for pres:additive
2007/03/26 13:37:32 cl 1.10.64.1: #146582# changed anim:iterate to support an xsd:duration

xmloff/source/draw/animationexport.cxx

diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 2a66299..09c26b9 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -4,9 +4,9 @@
 *
 *  $RCSfile: animationexport.cxx,v $
 *
 *  $Revision: 1.10 $
 *  $Revision: 1.11 $
 *
 *  last change: $Author: vg $ $Date: 2006-11-21 17:32:43 $
 *  last change: $Author: ihi $ $Date: 2007-04-16 13:09:41 $
 *
 *  The Contents of this file are made available subject to
 *  the terms of GNU Lesser General Public License Version 2.1.
@@ -135,6 +135,7 @@
#endif

#include <tools/debug.hxx>
#include <tools/time.hxx>

#ifndef __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__
#include "unointerfacetouniqueidentifiermapper.hxx"
@@ -1013,9 +1014,19 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >&
            double fTemp = xIter->getIterateInterval();
            if( fTemp )
            {
                sTmp.append( fTemp );
                sTmp.append( (sal_Unicode)'s' );
                mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, sTmp.makeStringAndClear() );
                if( mrExport.isExperimentalOdfExportEnabled() )
                {
                    // issue 146582
                    sal_Int32 nSecondsFraction = static_cast<sal_Int32>(fTemp * 1000 ) % 1000;
                    ::Time aTime( static_cast<sal_Int32>( fTemp * 100 ) );
                    mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, SvXMLUnitConverter::convertTimeDuration( aTime, nSecondsFraction ) );
                }
                else
                {
                    sTmp.append( fTemp );
                    sTmp.append( (sal_Unicode)'s' );
                    mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, sTmp.makeStringAndClear() );
                }
            }
        }

@@ -1180,7 +1191,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
                    mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_ACCUMULATE, XML_SUM );

                nTemp = xAnimate->getAdditive();
                if( nTemp != AnimationAdditiveMode::REPLACE )
                if( nTemp != AnimationAdditiveMode::BASE )
                {
                    SvXMLUnitConverter::convertEnum( sTmp, (USHORT)nTemp, getAnimationsEnumMap(Animations_EnumMap_AdditiveMode) );
                    mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ADDITIVE, sTmp.makeStringAndClear() );