diff options
| author | Andre Fischer <af@apache.org> | 2012-06-25 08:09:05 +0000 |
|---|---|---|
| committer | Andre Fischer <af@apache.org> | 2012-06-25 08:09:05 +0000 |
| commit | c4c014f74afaa9ca1b31c750b0445cf3f34e61a6 (patch) | |
| tree | 9256e5b512e62f52efc4676bddd95625a3fc2da7 /sd | |
| parent | 3cec3e3bd8d9ab45e184b274f2b1b22d079b4d5c (diff) | |
#i119740# Fixed export of fill property of animations to PPT.
Patch by: Tang Meng
Review by: Andre Fischer
Notes
Notes:
merged as: 9e0b99a78b1fdb545eefc76a0931e908481bbdb6
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 574a666d7a3f..a75a635f8b92 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -290,6 +290,16 @@ AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContai 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 ) ) { |