INTEGRATION: CWS presfixes12 (1.6.12); FILE MERGED

2007/02/06 17:18:06 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:01 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

1 files changed, 14 insertions, 9 deletions

diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
index bf686e717463..6c7a015c3e6d 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: animationtransformnode.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:31:17 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 14:48:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -37,12 +37,13 @@
 #include "precompiled_slideshow.hxx"
 
 // must be first
-#include "canvas/debug.hxx"
-#include "canvas/verbosetrace.hxx"
+#include <canvas/debug.hxx>
+#include <canvas/verbosetrace.hxx>
+#include <com/sun/star/animations/AnimationTransformType.hpp>
+
 #include "animationtransformnode.hxx"
 #include "animationfactory.hxx"
 #include "activitiesfactory.hxx"
-#include "com/sun/star/animations/AnimationTransformType.hpp"
 
 using namespace com::sun::star;
 
@@ -77,7 +78,8 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
             aParms,
             AnimationFactory::createPairPropertyAnimation(
                 rShape,
-                getContext().mpLayerManager,
+                getContext().mpSubsettableShapeManager,
+                getSlideSize(),
                 nTransformType ),
             getXAnimateNode() );
 
@@ -88,7 +90,8 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
                 ::rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("Rotate") ),
                 rShape,
-                getContext().mpLayerManager ),
+                getContext().mpSubsettableShapeManager,
+                getSlideSize() ),
             getXAnimateNode() );
 
     case animations::AnimationTransformType::SKEWX:
@@ -98,7 +101,8 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
                 ::rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("SkewX") ),
                 rShape,
-                getContext().mpLayerManager ),
+                getContext().mpSubsettableShapeManager,
+                getSlideSize() ),
             getXAnimateNode() );
 
     case animations::AnimationTransformType::SKEWY:
@@ -108,7 +112,8 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
                 ::rtl::OUString(
                     RTL_CONSTASCII_USTRINGPARAM("SkewY") ),
                 rShape,
-                getContext().mpLayerManager ),
+                getContext().mpSubsettableShapeManager,
+                getSlideSize() ),
             getXAnimateNode() );
     }
 }