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/simplecontinuousactivitybase.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/simplecontinuousactivitybase.hxx')
-rw-r--r-- | slideshow/source/engine/activities/simplecontinuousactivitybase.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx index 031c1e972c5b..73d6b0b6803b 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.hxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.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 @@ -50,37 +50,37 @@ namespace slideshow virtual double calcTimeLag() const; virtual bool perform(); - + protected: /** Hook for derived classes This method will be called from perform(). - + @param nSimpleTime Simple animation time, without repeat, acceleration or deceleration applied. This value is always in the [0,1] range, the repeat is accounted for with the nRepeatCount parameter. - + @param nRepeatCount Number of full repeats already performed */ virtual void simplePerform( double nSimpleTime, sal_uInt32 nRepeatCount ) const = 0; - + virtual void startAnimation(); private: /// Time elapsed since activity started - ::canvas::tools::ElapsedTime maTimer; + ::canvas::tools::ElapsedTime maTimer; /// Simple duration of activity - const double mnMinSimpleDuration; + const double mnMinSimpleDuration; /// Minimal number of frames to show (see ActivityParameters) - const sal_uInt32 mnMinNumberOfFrames; + const sal_uInt32 mnMinNumberOfFrames; /// Actual number of frames shown until now. - sal_uInt32 mnCurrPerformCalls; + sal_uInt32 mnCurrPerformCalls; }; } } |