You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2012/06/25 11:09:06 UTC
svn commit: r1353438 -
/incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx
Author: af
Date: Mon Jun 25 09:09:05 2012
New Revision: 1353438
URL: http://svn.apache.org/viewvc?rev=1353438&view=rev
Log:
#i119740# Fixed export of fill property of animations to PPT.
Patch by: Tang Meng
Review by: Andre Fischer
Modified:
incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx
Modified: incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx?rev=1353438&r1=1353437&r2=1353438&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx Mon Jun 25 09:09:05 2012
@@ -290,6 +290,16 @@ AnimationExporter::AnimationExporter( co
static sal_Int16 GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault )
{
sal_Int16 nFill = xNode->getFill();
+ //[bug 119699] <Animation> The animation effect "Emphasis->FlashBulb" play incorrectly in Aoo saves a .ppt to another .ppt and plays the saved one.
+ //[bug 119740] <Animation> The animation effect "Entrance->Flash Once" fails to play in Aoo while Aoo saves a .ppt to another .ppt and plays the saved one.
+ if ((xNode->getType() == AnimationNodeType::ANIMATE)
+ ||(xNode->getType() == AnimationNodeType::SET)
+ ||(xNode->getType() == AnimationNodeType::TRANSITIONFILTER))
+ {
+ if ( nFill == AnimationFill::DEFAULT )
+ return nFill;
+ }
+
if ( ( nFill == AnimationFill::DEFAULT ) ||
( nFill == AnimationFill::INHERIT ) )
{