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

[Andre Fischer]

 sd/source/filter/eppt/pptexanimations.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 9e0b99a78b1fdb545eefc76a0931e908481bbdb6
Author: Andre Fischer <af at apache.org>
Date:   Mon Jun 25 08:09:05 2012 +0000

    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

diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 6dbaeec..d112fb4 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 ) )
     {