diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
commit | 4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch) | |
tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /slideshow/source/engine/activities/activityparameters.hxx | |
parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:18 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2764d5adfcd646794593cda200fca9d4988d0d06
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'slideshow/source/engine/activities/activityparameters.hxx')
-rw-r--r-- | slideshow/source/engine/activities/activityparameters.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/slideshow/source/engine/activities/activityparameters.hxx b/slideshow/source/engine/activities/activityparameters.hxx index f09148988c11..0bab1359e9c4 100644 --- a/slideshow/source/engine/activities/activityparameters.hxx +++ b/slideshow/source/engine/activities/activityparameters.hxx @@ -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 @@ -41,42 +41,42 @@ namespace slideshow { namespace internal { /** Parameter struct for animation activities - + This struct contains all common parameters needed to initialize the activities generated by the ActivityFactory. */ struct ActivityParameters -{ - /** Create - +{ + /** Create + @param rEndEvent Event to be fired, when the activity ends. - + @param rEventQueue Queue to add end event to - + @param nMinDuration Minimal duration of the activity (might actually be longer because of nMinNumberOfFrames). Note that this duration must always be the <em>simple</em> duration, i.e. without any repeat. - + @param rRepeats Number of repeats. If this parameter is invalid, infinite repeat is assumed. - + @param nAccelerationFraction Value between 0 and 1, denoting the fraction of the total simple duration, which the animation should accelerate. - - @param nDecelerationFraction + + @param nDecelerationFraction Value between 0 and 1, denoting the fraction of the total simple duration, which the animation should decelerate. Note that the ranges [0,nAccelerationFraction] and [nDecelerationFraction,1] must be non-overlapping! - + @param bAutoReverse When true, at the end of the simple duration, the animation plays reversed to the start value. Note that @@ -106,33 +106,33 @@ struct ActivityParameters mnDecelerationFraction( nDecelerationFraction ), mnMinNumberOfFrames( nMinNumberOfFrames ), mbAutoReverse( bAutoReverse ) {} - + /// End event to fire, when activity is over const EventSharedPtr& mrEndEvent; /// Wakeup event to use for discrete activities WakeupEventSharedPtr mpWakeupEvent; - + /// EventQueue to add events to EventQueue& mrEventQueue; - + /// ActivitiesQueue to add events to ActivitiesQueue& mrActivitiesQueue; - + /// Optional formula ExpressionNodeSharedPtr mpFormula; - + /// Key times, for discrete and key time activities ::std::vector< double > maDiscreteTimes; - + /// Total duration of activity (including all repeats) const double mnMinDuration; ::boost::optional<double> const& mrRepeats; const double mnAccelerationFraction; const double mnDecelerationFraction; - + /// Minimal number of frames this activity must render const sal_uInt32 mnMinNumberOfFrames; - + /// When true, activity is played reversed after mnDuration. const bool mbAutoReverse; }; |