CWS-TOOLING: integrate CWS impress166

2009-01-27 11:42:29 +0100 af  r266972 : #i98508# Handle non DrawViewShell view shells correctly.
2009-01-21 10:41:32 +0100 af  r266635 : #i98069# Do not call PreModelChange() for every ModelLock.
2009-01-20 15:25:41 +0100 af  r266588 : #i98069# Added friend declaration that became necessary on Solaris after recent changes.
2009-01-19 13:48:47 +0100 af  r266493 : #i97478# Prevent SID_PARASPACE_(DE|IN)CREASE from crashing when style sheet is missing.
2009-01-16 11:52:37 +0100 af  r266411 : #i97338# Check the dispatcher before using it to show a context menu.
2009-01-15 14:33:55 +0100 sj  r266373 : #153716# taking care of font-independent line spacing (editmode and hittest)
2009-01-15 14:29:46 +0100 sj  r266372 : #153716# taking care of font-independent line spacing also in presentation styles
2009-01-14 14:04:16 +0100 af  r266301 : #i97634# Do view change synchronously.  Use shared pointers for view shells.
2009-01-14 14:01:27 +0100 af  r266300 : #i97634# Added non-API methods that update the configuration synchronously.
2009-01-14 13:34:40 +0100 af  r266295 : #i98069# Be more carefull with handling model updates to avoid assertion regarding number of selected pages.
2009-01-14 11:34:57 +0100 cl  r266270 : #i97261# force outliner para oibject after text edit
2009-01-14 10:49:08 +0100 cl  r266269 : #i97413# dispose cell undo action if shape dies
2009-01-13 18:50:05 +0100 cl  r266247 : #i97347# fixed cell undo crash
2009-01-12 14:16:56 +0100 af  r266156 : #i97296# Using is() method to check WeakReference for validity.
2009-01-12 13:52:00 +0100 af  r266155 : #i97190# Turned static_cast to dynamic_cast in CreateChildList.
2009-01-12 13:06:57 +0100 af  r266153 : #i97552# Catching Exceptions caught while accessing OLE-Object that is to be inserted.
2009-01-12 13:06:37 +0100 cl  r266152 : #i96164# applied patch to fix ambiguous operation

1 files changed, 12 insertions, 9 deletions

diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
index 2f929e2fccb7..f489fffd9ed3 100644
--- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx
+++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx
@@ -33,6 +33,7 @@
 
 #include <svx/svdobj.hxx>
 #include "OutlinerIterator.hxx"
+#include <boost/weak_ptr.hpp>
 
 class SdDrawDocument;
 class SdPage;
@@ -40,7 +41,7 @@ class SdrObjListIter;
 
 namespace sd {
 
-class DrawViewShell;
+class ViewShell;
 
 namespace outliner {
 
@@ -58,15 +59,17 @@ public:
         classes.
         @param pDocument
             The document provides the information to be iterated on.
-        @param pViewShell
+        @param pViewShellWeak
             Some information has to be taken from the view shell.
         @param bDirectionIsForward
             This flag defines the iteration direction.  When <TRUE/> then
             the direction is forwards otherwise it is backwards.
     */
-    IteratorImplBase (SdDrawDocument* pDocument, DrawViewShell* pViewShell,
+    IteratorImplBase (SdDrawDocument* pDocument,
+        const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
         bool bDirectionIsForward);
-    IteratorImplBase (SdDrawDocument* pDocument, DrawViewShell* pViewShell,
+    IteratorImplBase (SdDrawDocument* pDocument,
+        const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
         bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode);
     virtual ~IteratorImplBase (void);
 
@@ -123,7 +126,7 @@ protected:
     /// The document on whose data the iterator operates.
     SdDrawDocument* mpDocument;
     /// Necessary secondary source of information.
-    DrawViewShell* mpViewShell;
+    ::boost::weak_ptr<ViewShell> mpViewShellWeak;
     /// Specifies the search direction.
     bool mbDirectionIsForward;
 };
@@ -148,7 +151,7 @@ public:
         const ::std::vector< SdrObjectWeakRef >& rObjectList,
         sal_Int32 nObjectIndex,
         SdDrawDocument* pDocument,
-        DrawViewShell* pViewShell,
+        const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
         bool bDirectionIsForward);
     SelectionIteratorImpl (const SelectionIteratorImpl& rObject);
     virtual ~SelectionIteratorImpl (void);
@@ -191,12 +194,12 @@ public:
     ViewIteratorImpl (
         sal_Int32 nPageIndex,
         SdDrawDocument* pDocument,
-        DrawViewShell* pViewShell,
+        const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
         bool bDirectionIsForward);
     ViewIteratorImpl (
         sal_Int32 nPageIndex,
         SdDrawDocument* pDocument,
-        DrawViewShell* pViewShell,
+        const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
         bool bDirectionIsForward,
         PageKind ePageKind,
         EditMode eEditMode);
@@ -252,7 +255,7 @@ public:
         PageKind ePageKind,
         EditMode eEditMode,
         SdDrawDocument* pDocument,
-        DrawViewShell* pViewShell,
+        const ::boost::weak_ptr<ViewShell>& rpViewShellWeak,
         bool bDirectionIsForward);
     virtual ~DocumentIteratorImpl (void);