diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-07-17 14:00:51 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-07-17 14:00:51 +0000 |
commit | 2816d64ef6e4069dd5d434a97082c7b7cc8660e3 (patch) | |
tree | d74f70d8a2ac50fc8b313d2531019730cd4c4874 | |
parent | 73e51a766280543225e10b2c98696bcc0b8602e7 (diff) |
INTEGRATION: CWS presfixes12 (1.5.12); FILE MERGED
2007/01/29 14:02:18 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
-rw-r--r-- | slideshow/source/inc/activitiesfactory.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/slideshow/source/inc/activitiesfactory.hxx b/slideshow/source/inc/activitiesfactory.hxx index c80ea59fff09..42c177e86dbc 100644 --- a/slideshow/source/inc/activitiesfactory.hxx +++ b/slideshow/source/inc/activitiesfactory.hxx @@ -4,9 +4,9 @@ * * $RCSfile: activitiesfactory.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:50:08 $ + * last change: $Author: obo $ $Date: 2007-07-17 15:00:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,7 +44,6 @@ #include "event.hxx" #include "eventqueue.hxx" #include "shape.hxx" -#include "layermanager.hxx" #include "numberanimation.hxx" #include "enumanimation.hxx" #include "coloranimation.hxx" @@ -78,7 +77,7 @@ public: double nAcceleration, double nDeceleration, const ShapeSharedPtr& rShape, - const LayerManagerSharedPtr& rLayerManager ) + const ::basegfx::B2DVector& rSlideBounds ) : mpEndEvent( rEndEvent ), mrEventQueue( rEventQueue ), mrActivitiesQueue( rActivitiesQueue ), @@ -88,7 +87,7 @@ public: mnAcceleration( nAcceleration ), mnDeceleration( nDeceleration ), mpShape( rShape ), - mpLayerManager( rLayerManager ), + maSlideBounds( rSlideBounds ), mbAutoReverse( bAutoReverse ) {} /// End event to fire when animation is over @@ -141,7 +140,7 @@ public: ShapeSharedPtr mpShape; /// LayerManager, to get page size from - LayerManagerSharedPtr mpLayerManager; + ::basegfx::B2DVector maSlideBounds; /// When true, activity is played reversed after mnDuration. bool mbAutoReverse; |