summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:16 +0200
commit0553d10867217e30a86c88c17ccb15a06030ce07 (patch)
tree4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 /slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
parentd0ac8f1e7866c637be15f081b59ef456aacb954a (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit c0de36f21ef8f0afd7667f53a5d97dbc264a1cfb (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:26 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit e31a45314a5a2f1e7e2bbea4a2bb6eca7beb7962 Merge: 7234327 29a7259 Author: Jan Holesovsky <kendy@suse.cz> Date: Wed Sep 8 11:34:03 2010 +0200 Merge commit 'ooo/OOO330_m7' commit 29a72592b0046498a30e87a7beedae4d29161f9b (tag: refs/tags/ooo/OOO330_m7) Merge: 10146e0 6b04480 Author: Kurt Zenker <kz@openoffice.org> Date: Tue Aug 31 15:10:03 2010 +0200 CWS-TOOLING: integrate CWS impress197 commit 6b04480dd88a5bd048d12874dc8c07630670c239 Author: sj <sj@openoffice.org> Date: Mon Aug 9 14:11:58 2010 +0200 impress197: #163250# fixed string handling, improved polygon splitting sd/source/filter/ppt/propread.cxx | 128 ++++++++++++++++++++++++------------- 1 files changed, 83 insertions(+), 45 deletions(-) commit a37d85f979d1616b158c918762821ed82b1e0691 Merge: 1380a03 d766efe Author: Christian Lippka <christian.lippka@sun.com> Date: Fri Aug 6 14:53:07 2010 +0200 merge commit 1380a03aaf7464643eb99de1488ab5b372663ccd Author: Christian Lippka <christian.lippka@sun.com> Date: Wed Aug 4 10:48:35 2010 +0200 #i113603# only change layout shape size on init or of user call is set sd/source/core/sdpage.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d766efe9f601a65cd22b46e0f4131d9acd74b1a8 Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com> Date: Thu Jan 1 00:00:00 1970 +0000 impress197: #i112420# Create accessibility object of ToolPanelViewShell in constructor. sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 17 +++++++++++++++-- sd/source/ui/view/sdwindow.cxx | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-)
Notes
Notes: split repo tag: impress_OOO_BUILD_3_2_98_1
Diffstat (limited to 'slideshow/source/engine/activities/simplecontinuousactivitybase.cxx')
-rw-r--r--slideshow/source/engine/activities/simplecontinuousactivitybase.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
index 9b08adc9b7b2..b2139621c18e 100644
--- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
+++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
@@ -1,7 +1,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
@@ -51,7 +51,7 @@ namespace slideshow
void SimpleContinuousActivityBase::startAnimation()
{
- // init timer. We measure animation time only when we're
+ // init timer. We measure animation time only when we're
// actually started.
maTimer.reset();
}
@@ -61,7 +61,7 @@ namespace slideshow
ActivityBase::calcTimeLag();
if (! isActive())
return 0.0;
-
+
// retrieve locally elapsed time
const double nCurrElapsedTime( maTimer.getElapsedTime() );
@@ -74,7 +74,7 @@ namespace slideshow
// here, try to spread the animator calls uniquely over
// the [0,1] parameter range. Be aware of the fact that
// perform will be called at least mnMinNumberOfTurns
- // times.
+ // times.
// fraction of time elapsed
const double nFractionElapsedTime(
@@ -109,26 +109,26 @@ namespace slideshow
VERBOSE_TRACE( "SimpleContinuousActivityBase::perform(): "
"t=%f is based on number of calls",
nFractionRequiredCalls );
-
+
// lag global time, so all other animations lag, too:
return ((nFractionElapsedTime - nFractionRequiredCalls)
* mnMinSimpleDuration);
}
}
-
+
bool SimpleContinuousActivityBase::perform()
{
// call base class, for start() calls and end handling
if( !ActivityBase::perform() )
return false; // done, we're ended
-
+
// get relative animation position
// ===============================
-
+
const double nCurrElapsedTime( maTimer.getElapsedTime() );
double nT( nCurrElapsedTime / mnMinSimpleDuration );
-
+
// one of the stop criteria reached?
// =================================
@@ -156,7 +156,7 @@ namespace slideshow
// to give animation the chance to render the last
// frame below
bActivityEnding = true;
-
+
// clamp animation to max permissible value
nT = nEffectiveRepeat;
}
@@ -201,7 +201,7 @@ namespace slideshow
// calc simple time and number of repeats from nT
// Now, that's easy, since the fractional part of
- // nT gives the relative simple time, and the
+ // nT gives the relative simple time, and the
// integer part the number of full repeats:
nRelativeSimpleTime = modf(nT, &nRepeats);