INTEGRATION: CWS presfixes12 (1.6.12); FILE MERGED

2007/01/29 14:01:55 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, 20 insertions, 19 deletions

diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 2bfe4a352ec9..5ffc50403ab1 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: shapesubset.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-12-13 15:19:38 $
+ *  last change: $Author: obo $ $Date: 2007-07-17 14:39:43 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,16 +50,16 @@ namespace slideshow
 {
     namespace internal
     {
-        ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape,
-                                  const DocTreeNode&                rTreeNode,
-                                  const LayerManagerSharedPtr&      rLayerManager ) :
+        ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr&       rOriginalShape,
+                                  const DocTreeNode&                      rTreeNode,
+                                  const SubsettableShapeManagerSharedPtr& rShapeManager ) :
             mpOriginalShape( rOriginalShape ),
             mpSubsetShape(),
             maTreeNode( rTreeNode ),
-            mpLayerManager( rLayerManager )
+            mpShapeManager( rShapeManager )
         {
-            ENSURE_AND_THROW( mpLayerManager,
-                              "ShapeSubset::ShapeSubset(): Invalid layer manager" );
+            ENSURE_AND_THROW( mpShapeManager,
+                              "ShapeSubset::ShapeSubset(): Invalid shape manager" );
         }
 
         ShapeSubset::ShapeSubset( const ShapeSubsetSharedPtr&   rOriginalSubset,
@@ -69,25 +69,25 @@ namespace slideshow
                              rOriginalSubset->mpOriginalShape ),
             mpSubsetShape(),
             maTreeNode( rTreeNode ),
-            mpLayerManager( rOriginalSubset->mpLayerManager )
+            mpShapeManager( rOriginalSubset->mpShapeManager )
         {
-            ENSURE_AND_THROW( mpLayerManager,
-                              "ShapeSubset::ShapeSubset(): Invalid layer manager" );
+            ENSURE_AND_THROW( mpShapeManager,
+                              "ShapeSubset::ShapeSubset(): Invalid shape manager" );
             ENSURE_AND_THROW( rOriginalSubset->maTreeNode.isEmpty() ||
                               (rTreeNode.getStartIndex() >= rOriginalSubset->maTreeNode.getStartIndex() &&
                                rTreeNode.getEndIndex() <= rOriginalSubset->maTreeNode.getEndIndex()),
                               "ShapeSubset::ShapeSubset(): Subset is bigger than parent" );
         }
 
-        ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape,
-                                  const LayerManagerSharedPtr&      rLayerManager ) :
+        ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr&       rOriginalShape,
+                                  const SubsettableShapeManagerSharedPtr& rShapeManager ) :
             mpOriginalShape( rOriginalShape ),
             mpSubsetShape(),
             maTreeNode(),
-            mpLayerManager( rLayerManager )
+            mpShapeManager( rShapeManager )
         {
-            ENSURE_AND_THROW( mpLayerManager,
-                              "ShapeSubset::ShapeSubset(): Invalid layer manager" );
+            ENSURE_AND_THROW( mpShapeManager,
+                              "ShapeSubset::ShapeSubset(): Invalid shape manager" );
         }
 
         ShapeSubset::~ShapeSubset()
@@ -97,7 +97,8 @@ namespace slideshow
                 // if not done yet: revoke subset from original
                 disableSubsetShape();
             }
-            catch (uno::Exception &) {
+            catch (uno::Exception &)
+            {
                 OSL_ENSURE( false, rtl::OUStringToOString(
                                 comphelper::anyToString(
                                     cppu::getCaughtException() ),
@@ -115,7 +116,7 @@ namespace slideshow
             if( !mpSubsetShape &&
                 !maTreeNode.isEmpty() )
             {
-                mpSubsetShape = mpLayerManager->getSubsetShape(
+                mpSubsetShape = mpShapeManager->getSubsetShape(
                     mpOriginalShape,
                     maTreeNode );
             }
@@ -127,7 +128,7 @@ namespace slideshow
         {
             if( mpSubsetShape )
             {
-                mpLayerManager->revokeSubset( mpOriginalShape,
+                mpShapeManager->revokeSubset( mpOriginalShape,
                                               mpSubsetShape );
                 mpSubsetShape.reset();
             }