diff options
| author | Andre Fischer <af@apache.org> | 2012-06-25 08:09:05 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-12 20:03:25 +0100 |
| commit | 9e0b99a78b1fdb545eefc76a0931e908481bbdb6 (patch) | |
| tree | 37dbffee48ed7ce7aeaa832767b2b3b33a5d93d0 /sd | |
| parent | fa169ffc3d8d5e3cde41411858cc40546fc04e0e (diff) | |
Resolves: #i119740# Fixed export of fill property of animations to PPT
Patch by: Tang Meng
Review by: Andre Fischer
(cherry picked from commit c4c014f74afaa9ca1b31c750b0445cf3f34e61a6)
Change-Id: I5a57fed3b8ee13d88eaed6ed6e98a6d167f9fa89
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 6dbaeecddbea..d112fb48b798 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -278,6 +278,16 @@ AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContai sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault ) { sal_Int16 nFill = xNode->getFill(); + //#i119699 <Animation> The animation effect "Emphasis->FlashBulb" play incorrectly in Aoo saves a .ppt to another .ppt and plays the saved one. + //#i119740 <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 ) ) { |