INTEGRATION: CWS presfixes09 (1.4.18); FILE MERGED

2006/10/18 19:50:44 thb 1.4.18.4: RESYNC: (1.4-1.5); FILE MERGED
2006/04/24 13:25:26 thb 1.4.18.3: #i53194# Unified include statements (local headers always have double quotes; external headers angle brackets); reverted EventMultiplexer pause events to shared_ptr; removed EventMultiplexer::removeViewHandler(), since the handler is held weakly, anyway.
2006/04/12 20:40:04 thb 1.4.18.2: #i37778# Replaced all shared_ptr.get() != NULL places with the more elegant automatic-conversion-to-bool version (at least where the compiler tolerated that)
2006/03/24 18:23:09 thb 1.4.18.1: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow

1 files changed, 29 insertions, 14 deletions

diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 2c1ff44e8a09..2bfe4a352ec9 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: shapesubset.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 08:28:12 $
+ *  last change: $Author: kz $ $Date: 2006-12-13 15:19:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -37,10 +37,16 @@
 #include "precompiled_slideshow.hxx"
 
 #include <canvas/debug.hxx>
-#include <shapesubset.hxx>
 
+#include <comphelper/anytostring.hxx>
+#include <cppuhelper/exc_hlp.hxx>
 
-namespace presentation
+#include "shapesubset.hxx"
+
+
+using namespace ::com::sun::star;
+
+namespace slideshow
 {
     namespace internal
     {
@@ -52,20 +58,20 @@ namespace presentation
             maTreeNode( rTreeNode ),
             mpLayerManager( rLayerManager )
         {
-            ENSURE_AND_THROW( mpLayerManager.get(),
+            ENSURE_AND_THROW( mpLayerManager,
                               "ShapeSubset::ShapeSubset(): Invalid layer manager" );
         }
 
         ShapeSubset::ShapeSubset( const ShapeSubsetSharedPtr&   rOriginalSubset,
                                   const DocTreeNode&            rTreeNode ) :
-            mpOriginalShape( rOriginalSubset->mpSubsetShape.get() ?
+            mpOriginalShape( rOriginalSubset->mpSubsetShape ?
                              rOriginalSubset->mpSubsetShape :
                              rOriginalSubset->mpOriginalShape ),
             mpSubsetShape(),
             maTreeNode( rTreeNode ),
             mpLayerManager( rOriginalSubset->mpLayerManager )
         {
-            ENSURE_AND_THROW( mpLayerManager.get(),
+            ENSURE_AND_THROW( mpLayerManager,
                               "ShapeSubset::ShapeSubset(): Invalid layer manager" );
             ENSURE_AND_THROW( rOriginalSubset->maTreeNode.isEmpty() ||
                               (rTreeNode.getStartIndex() >= rOriginalSubset->maTreeNode.getStartIndex() &&
@@ -80,24 +86,33 @@ namespace presentation
             maTreeNode(),
             mpLayerManager( rLayerManager )
         {
-            ENSURE_AND_THROW( mpLayerManager.get(),
+            ENSURE_AND_THROW( mpLayerManager,
                               "ShapeSubset::ShapeSubset(): Invalid layer manager" );
         }
 
         ShapeSubset::~ShapeSubset()
         {
-            // if not done yet: revoke subset from original
-            disableSubsetShape();
+            try
+            {
+                // if not done yet: revoke subset from original
+                disableSubsetShape();
+            }
+            catch (uno::Exception &) {
+                OSL_ENSURE( false, rtl::OUStringToOString(
+                                comphelper::anyToString(
+                                    cppu::getCaughtException() ),
+                                RTL_TEXTENCODING_UTF8 ).getStr() );
+            }
         }
 
         AttributableShapeSharedPtr ShapeSubset::getSubsetShape() const
         {
-            return mpSubsetShape.get() ? mpSubsetShape : mpOriginalShape;
+            return mpSubsetShape ? mpSubsetShape : mpOriginalShape;
         }
 
         bool ShapeSubset::enableSubsetShape()
         {
-            if( !mpSubsetShape.get() &&
+            if( !mpSubsetShape &&
                 !maTreeNode.isEmpty() )
             {
                 mpSubsetShape = mpLayerManager->getSubsetShape(
@@ -105,12 +120,12 @@ namespace presentation
                     maTreeNode );
             }
 
-            return mpSubsetShape.get();
+            return mpSubsetShape;
         }
 
         void ShapeSubset::disableSubsetShape()
         {
-            if( mpSubsetShape.get() )
+            if( mpSubsetShape )
             {
                 mpLayerManager->revokeSubset( mpOriginalShape,
                                               mpSubsetShape );