diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
commit | 0553d10867217e30a86c88c17ccb15a06030ce07 (patch) | |
tree | 4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 /slideshow/source/engine/activities/discreteactivitybase.cxx | |
parent | d0ac8f1e7866c637be15f081b59ef456aacb954a (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/discreteactivitybase.cxx')
-rw-r--r-- | slideshow/source/engine/activities/discreteactivitybase.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx index 34f3fe285207..32bf0494d737 100644 --- a/slideshow/source/engine/activities/discreteactivitybase.cxx +++ b/slideshow/source/engine/activities/discreteactivitybase.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 @@ -50,7 +50,7 @@ namespace slideshow ENSURE_OR_THROW( mpWakeupEvent, "DiscreteActivityBase::DiscreteActivityBase(): Invalid wakeup event" ); - ENSURE_OR_THROW( !maDiscreteTimes.empty(), + ENSURE_OR_THROW( !maDiscreteTimes.empty(), "DiscreteActivityBase::DiscreteActivityBase(): time vector is empty, why do you create me?" ); #ifdef DBG_UTIL @@ -60,7 +60,7 @@ namespace slideshow for( ::std::size_t i=1, len=maDiscreteTimes.size(); i<len; ++i ) { if( maDiscreteTimes[i] < 0.0 || - maDiscreteTimes[i] > 1.0 || + maDiscreteTimes[i] > 1.0 || maDiscreteTimes[i-1] < 0.0 || maDiscreteTimes[i-1] > 1.0 ) { @@ -81,8 +81,8 @@ namespace slideshow mpWakeupEvent->start(); } - sal_uInt32 DiscreteActivityBase::calcFrameIndex( sal_uInt32 nCurrCalls, - ::std::size_t nVectorSize ) const + sal_uInt32 DiscreteActivityBase::calcFrameIndex( sal_uInt32 nCurrCalls, + ::std::size_t nVectorSize ) const { if( isAutoReverse() ) { @@ -103,8 +103,8 @@ namespace slideshow } } - sal_uInt32 DiscreteActivityBase::calcRepeatCount( sal_uInt32 nCurrCalls, - ::std::size_t nVectorSize ) const + sal_uInt32 DiscreteActivityBase::calcRepeatCount( sal_uInt32 nCurrCalls, + ::std::size_t nVectorSize ) const { if( isAutoReverse() ) return nCurrCalls / (2*nVectorSize); // we've got 2 cycles per repeat @@ -125,11 +125,11 @@ namespace slideshow // TODO(Q3): Refactor this mess - // call derived class with current frame index (modulo + // call derived class with current frame index (modulo // vector size, to cope with repeats) - perform( calcFrameIndex( mnCurrPerformCalls, nVectorSize ), + perform( calcFrameIndex( mnCurrPerformCalls, nVectorSize ), calcRepeatCount( mnCurrPerformCalls, nVectorSize ) ); - + // calc next index ++mnCurrPerformCalls; @@ -142,21 +142,21 @@ namespace slideshow if( isAutoReverse() ) nCurrRepeat /= 2.0; - // schedule next frame, if either repeat is indefinite + // schedule next frame, if either repeat is indefinite // (repeat forever), or we've not yet reached the requested // repeat count if( !isRepeatCountValid() || nCurrRepeat < getRepeatCount() ) { - // add wake-up event to queue (modulo + // add wake-up event to queue (modulo // vector size, to cope with repeats). // repeat is handled locally, only apply acceleration/deceleration. - // Scale time vector with simple duration, offset with full repeat + // Scale time vector with simple duration, offset with full repeat // times. // // Somewhat condensed, the argument for setNextTimeout below could - // be written as + // be written as // // mnSimpleDuration*(nFullRepeats + calcAcceleratedTime( currentRepeatTime )), // @@ -165,15 +165,15 @@ namespace slideshow // Note that calcAcceleratedTime() is only applied to the current repeat's value, // not to the total resulting time. This is in accordance with the SMIL spec. // - mpWakeupEvent->setNextTimeout( + mpWakeupEvent->setNextTimeout( mnSimpleDuration*( - calcRepeatCount( - mnCurrPerformCalls, - nVectorSize ) + - calcAcceleratedTime( + calcRepeatCount( + mnCurrPerformCalls, + nVectorSize ) + + calcAcceleratedTime( maDiscreteTimes[ - calcFrameIndex( - mnCurrPerformCalls, + calcFrameIndex( + mnCurrPerformCalls, nVectorSize ) ] ) ) ); getEventQueue().addEvent( mpWakeupEvent ); @@ -196,7 +196,7 @@ namespace slideshow // dispose event if( mpWakeupEvent ) mpWakeupEvent->dispose(); - + // release references mpWakeupEvent.reset(); |