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

Caolán McNamara caolanm at redhat.com
Wed Mar 8 11:37:43 UTC 2017


 slideshow/source/engine/shapes/intrinsicanimationactivity.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 57b8a0c3178a0899f5a607e275b5ef8d7c986255
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 8 10:04:17 2017 +0000

    show the last gif frame when the animation ends
    
    Change-Id: I240d0a46cff905edababbd13fe7e58c9e4d0f0db

diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index e44f832..15aca74 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -173,12 +173,16 @@ namespace slideshow
                 return false;
             }
 
+            const ::std::size_t nNumFrames(maTimeouts.size());
+
             // mnNumLoops == 0 means infinite looping
             if( mnNumLoops != 0 &&
                 mnLoopCount >= mnNumLoops )
             {
-                // #i55294# After finishing the loops, display the first frame
-                pDrawShape->setIntrinsicAnimationFrame( 0 );
+                // #i55294# After finishing the loops, display the last frame
+                // powerpoint 2013 and firefox etc show the last frame when
+                // the animation ends
+                pDrawShape->setIntrinsicAnimationFrame(nNumFrames - 1);
                 maContext.mpSubsettableShapeManager->notifyShapeUpdate( pDrawShape );
 
                 end();
@@ -187,7 +191,6 @@ namespace slideshow
             }
 
             ::std::size_t       nNewIndex = 0;
-            const ::std::size_t nNumFrames(maTimeouts.size());
 
             pDrawShape->setIntrinsicAnimationFrame( mnCurrIndex );
 


More information about the Libreoffice-commits mailing list