From d5e9929575a29dc291d9d2829dca6e75f5e7b20f Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 17 Jul 2007 13:47:40 +0000 Subject: [PATCH] INTEGRATION: CWS presfixes12 (1.6.12); FILE MERGED 2007/02/06 17:18:05 thb 1.6.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable 2007/01/29 14:02:00 thb 1.6.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 --- .../animationnodes/animationpathmotionnode.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx index 8ac6f1fa6933..364b67b4ce7e 100644 --- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx +++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx @@ -4,9 +4,9 @@ * * $RCSfile: animationpathmotionnode.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2006-12-13 15:30:18 $ + * last change: $Author: obo $ $Date: 2007-07-17 14:47:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,8 +37,9 @@ #include "precompiled_slideshow.hxx" // must be first -#include "canvas/debug.hxx" -#include "canvas/verbosetrace.hxx" +#include +#include + #include "animationpathmotionnode.hxx" #include "animationfactory.hxx" @@ -63,7 +64,8 @@ AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const AnimationFactory::createPathMotionAnimation( aString, getShape(), - getContext().mpLayerManager ), + getContext().mpSubsettableShapeManager, + getSlideSize() ), true ); }