diff options
Diffstat (limited to 'slideshow/source/engine/shapes/intrinsicanimationactivity.cxx')
-rw-r--r-- | slideshow/source/engine/shapes/intrinsicanimationactivity.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index fb5179545821..e185085a9787 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,10 +78,10 @@ namespace slideshow Vector of timeout values, to wait before the next frame is shown. */ - IntrinsicAnimationActivity( const SlideShowContext& rContext, - const DrawShapeSharedPtr& rDrawShape, - const WakeupEventSharedPtr& rWakeupEvent, - const ::std::vector<double>& rTimeouts, + IntrinsicAnimationActivity( const SlideShowContext& rContext, + const DrawShapeSharedPtr& rDrawShape, + const WakeupEventSharedPtr& rWakeupEvent, + const ::std::vector<double>& rTimeouts, ::std::size_t nNumLoops, CycleMode eCycleMode ); @@ -127,10 +127,10 @@ namespace slideshow ////////////////////////////////////////////////////////////////////// - IntrinsicAnimationActivity::IntrinsicAnimationActivity( const SlideShowContext& rContext, - const DrawShapeSharedPtr& rDrawShape, - const WakeupEventSharedPtr& rWakeupEvent, - const ::std::vector<double>& rTimeouts, + IntrinsicAnimationActivity::IntrinsicAnimationActivity( const SlideShowContext& rContext, + const DrawShapeSharedPtr& rDrawShape, + const WakeupEventSharedPtr& rWakeupEvent, + const ::std::vector<double>& rTimeouts, ::std::size_t nNumLoops, CycleMode eCycleMode ) : maContext( rContext ), @@ -143,7 +143,7 @@ namespace slideshow mnNumLoops(nNumLoops), mnLoopCount(0), mbIsActive(false) - { + { ENSURE_OR_THROW( rContext.mpSubsettableShapeManager, "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Invalid shape manager" ); ENSURE_OR_THROW( rDrawShape, @@ -153,7 +153,7 @@ namespace slideshow ENSURE_OR_THROW( !rTimeouts.empty(), "IntrinsicAnimationActivity::IntrinsicAnimationActivity(): Empty timeout vector" ); - maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( + maContext.mpSubsettableShapeManager->addIntrinsicAnimationHandler( mpListener ); } @@ -170,7 +170,7 @@ namespace slideshow maTimeouts.clear(); mnCurrIndex = 0; - maContext.mpSubsettableShapeManager->removeIntrinsicAnimationHandler( + maContext.mpSubsettableShapeManager->removeIntrinsicAnimationHandler( mpListener ); } @@ -231,13 +231,13 @@ namespace slideshow mpWakeupEvent->start(); mpWakeupEvent->setNextTimeout( maTimeouts[nTrueIndex] ); - + mnLoopCount += (mnCurrIndex + 1) / (2*nNumFrames); nNewIndex = (mnCurrIndex + 1) % 2*nNumFrames; break; } } - + maContext.mrEventQueue.addEvent( mpWakeupEvent ); maContext.mpSubsettableShapeManager->notifyShapeUpdate( pDrawShape ); mnCurrIndex = nNewIndex; @@ -272,14 +272,14 @@ namespace slideshow ////////////////////////////////////////////////////////////////////// ActivitySharedPtr createIntrinsicAnimationActivity( - const SlideShowContext& rContext, - const DrawShapeSharedPtr& rDrawShape, - const WakeupEventSharedPtr& rWakeupEvent, - const ::std::vector<double>& rTimeouts, + const SlideShowContext& rContext, + const DrawShapeSharedPtr& rDrawShape, + const WakeupEventSharedPtr& rWakeupEvent, + const ::std::vector<double>& rTimeouts, ::std::size_t nNumLoops, CycleMode eCycleMode ) { - return ActivitySharedPtr( + return ActivitySharedPtr( new IntrinsicAnimationActivity(rContext, rDrawShape, rWakeupEvent, |