diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:45:46 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 13:45:46 +0000 |
| commit | b0a8cac914577d4cf3d43dcdb01abca94962baea (patch) | |
| tree | 2d3628c7d775cf4e6324ea0b247bead237a0a98d /slideshow/source/engine/activities | |
| parent | 9af9f99bc4aa9a469a4b0344201adecf7a01bdec (diff) | |
INTEGRATION: CWS presfixes12 (1.5.12); FILE MERGED
2007/02/02 08:47:51 thb 1.5.12.2: #i37778# Moved all old-style casts to sal::static_int_cast
2007/01/29 14:01:59 thb 1.5.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
Diffstat (limited to 'slideshow/source/engine/activities')
| -rw-r--r-- | slideshow/source/engine/activities/interpolation.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx index 321a5f095d2f..3ca986a539d2 100644 --- a/slideshow/source/engine/activities/interpolation.hxx +++ b/slideshow/source/engine/activities/interpolation.hxx @@ -4,9 +4,9 @@ * * $RCSfile: interpolation.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:27:16 $ + * last change: $Author: obo $ $Date: 2007-07-17 14:45:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,10 +33,10 @@ * ************************************************************************/ -#ifndef _SLIDESHOW_INTERPOLATION_HXX -#define _SLIDESHOW_INTERPOLATION_HXX +#ifndef INCLUDED_SLIDESHOW_INTERPOLATION_HXX +#define INCLUDED_SLIDESHOW_INTERPOLATION_HXX -#include <lerp.hxx> +#include "lerp.hxx" namespace slideshow { @@ -143,7 +143,7 @@ namespace slideshow // nTotalFrames > 1 condition below // for 1 and 0 frame animations, always take end value - const double nFraction( nTotalFrames > 1 ? (double)nFrame/(nTotalFrames-1) : 1.0 ); + const double nFraction( nTotalFrames > 1 ? double(nFrame)/(nTotalFrames-1) : 1.0 ); return rInterpolator( rFrom, rTo, nFraction ); } @@ -192,4 +192,4 @@ namespace slideshow } } -#endif /* _SLIDESHOW_INTERPOLATION_HXX */ +#endif /* INCLUDED_SLIDESHOW_INTERPOLATION_HXX */ |