INTEGRATION: CWS presfixes12 (1.10.12); FILE MERGED

2007/02/06 17:18:04 thb 1.10.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.10.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, 33 insertions, 32 deletions

diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index f2f421951812..cb1df298503c 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: animationnodefactory.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:29:56 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 14:47:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -37,8 +37,28 @@
 #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/drawing/XShape.hpp>
+#include <com/sun/star/animations/XAnimate.hpp>
+#include <com/sun/star/animations/AnimationNodeType.hpp>
+#include <com/sun/star/presentation/EffectNodeType.hpp>
+#include <com/sun/star/presentation/TextAnimationType.hpp>
+#include <com/sun/star/animations/XAnimateSet.hpp>
+#include <com/sun/star/animations/XIterateContainer.hpp>
+#include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
+#include <com/sun/star/animations/XAnimateMotion.hpp>
+#include <com/sun/star/animations/XAnimateColor.hpp>
+#include <com/sun/star/animations/XAnimateTransform.hpp>
+#include <com/sun/star/animations/AnimationTransformType.hpp>
+#include <com/sun/star/animations/XTransitionFilter.hpp>
+#include <com/sun/star/animations/XAudio.hpp>
+#include <com/sun/star/presentation/ParagraphTarget.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <animations/animationnodehelper.hxx>
+#include <basegfx/numeric/ftools.hxx>
+
 #include "animationnodefactory.hxx"
 #include "paralleltimecontainer.hxx"
 #include "sequentialtimecontainer.hxx"
@@ -52,29 +72,8 @@
 #include "animationcommandnode.hxx"
 #include "nodetools.hxx"
 #include "tools.hxx"
-#include "animations/animationnodehelper.hxx"
-#include "com/sun/star/drawing/XShape.hpp"
-#include "com/sun/star/animations/XAnimate.hpp"
-#include "com/sun/star/animations/AnimationNodeType.hpp"
-#include "com/sun/star/presentation/EffectNodeType.hpp"
-#include "com/sun/star/presentation/TextAnimationType.hpp"
-#include "com/sun/star/animations/XAnimateSet.hpp"
-#include "com/sun/star/animations/XIterateContainer.hpp"
-#include "com/sun/star/presentation/ShapeAnimationSubType.hpp"
-#include "com/sun/star/animations/XAnimateMotion.hpp"
-#include "com/sun/star/animations/XAnimateColor.hpp"
-#include "com/sun/star/animations/XAnimateTransform.hpp"
-#include "com/sun/star/animations/AnimationTransformType.hpp"
-#include "com/sun/star/animations/XTransitionFilter.hpp"
-#include "com/sun/star/animations/XAudio.hpp"
-#include "com/sun/star/presentation/ParagraphTarget.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "basegfx/numeric/ftools.hxx"
-#include "boost/bind.hpp"
-#include "boost/mem_fn.hpp"
-#include <vector>
-#include <algorithm>
-#include <iterator>
+
+#include <boost/bind.hpp>
 
 using namespace ::com::sun::star;
 
@@ -146,7 +145,7 @@ public:
         // realized (i.e. if enableSubsetShape() has been
         // called already), and the original of your clone
         // goes out of scope, then your subset will be
-        // gone (LayerManager::revokeSubset() be
+        // gone (SubsettableShapeManager::revokeSubset() be
         // called). As of now, this behaviour is not
         // triggered here (we either clone, XOR we enable
         // subset initially), but one might consider
@@ -245,7 +244,7 @@ bool implCreateIteratedNodes(
     // ==================================
 
     AttributableShapeSharedPtr  pTargetShape(
-        lookupAttributableShape( rContext.maContext.mpLayerManager,
+        lookupAttributableShape( rContext.maContext.mpSubsettableShapeManager,
                                  xTargetShape ) );
 
     const DocTreeNodeSupplier& rTreeNodeSupplier(
@@ -274,7 +273,7 @@ bool implCreateIteratedNodes(
                 rTreeNodeSupplier.getTreeNode(
                     aTarget.Paragraph,
                     DocTreeNode::NODETYPE_LOGICAL_PARAGRAPH ),
-                rContext.maContext.mpLayerManager ) );
+                rContext.maContext.mpSubsettableShapeManager ) );
 
         // iterate target is not the whole shape, but only
         // the selected paragraph - subset _must_ be
@@ -298,7 +297,7 @@ bool implCreateIteratedNodes(
     {
         pTargetSubset.reset(
             new ShapeSubset( pTargetShape,
-                             rContext.maContext.mpLayerManager ) );
+                             rContext.maContext.mpSubsettableShapeManager ));
     }
 
     aContext.mpMasterShapeSubset = pTargetSubset;
@@ -601,6 +600,7 @@ BaseNodeSharedPtr implCreateAnimationNode(
 
 AnimationNodeSharedPtr AnimationNodeFactory::createAnimationNode(
     const uno::Reference< animations::XAnimationNode >&   xNode,
+    const ::basegfx::B2DVector&                           rSlideSize,
     const SlideShowContext&                               rContext )
 {
     ENSURE_AND_THROW(
@@ -610,7 +610,8 @@ AnimationNodeSharedPtr AnimationNodeFactory::createAnimationNode(
     return BaseNodeSharedPtr( implCreateAnimationNode(
                                   xNode,
                                   BaseContainerNodeSharedPtr(), // no parent
-                                  NodeContext( rContext ) ) );
+                                  NodeContext( rContext,
+                                               rSlideSize )));
 }
 
 #if defined(VERBOSE) && defined(DBG_UTIL)