INTEGRATION: CWS impress69 (1.5.72); FILE MERGED

2005/10/14 11:12:10 af 1.5.72.4: RESYNC: (1.5-1.6); FILE MERGED
2005/09/22 15:33:43 af 1.5.72.3: #i54916# Fixed Solaris compiler problem.
2005/09/14 11:32:14 af 1.5.72.2: #i54589# Added support for persistent caches.
2005/09/01 15:36:05 af 1.5.72.1: #i54118# Added mbModelChangeWhileModifyEnabled flag and SFX_NOTIFY() method.

1 files changed, 19 insertions, 6 deletions

diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 35cbd40852ec..d630d969b0d6 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: SlideSorterView.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 06:21:27 $
+ *  last change: $Author: rt $ $Date: 2005-10-24 07:43:50 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -48,6 +48,7 @@
 #include <tools/gen.hxx>
 #endif
 #include <memory>
+#include <boost/shared_ptr.hpp>
 
 class Point;
 
@@ -189,7 +190,7 @@ public:
     ::sd::Window* GetWindow (void) const;
 
 
-    cache::PageCache& GetPreviewCache (void);
+    ::boost::shared_ptr<cache::PageCache> GetPreviewCache (void);
 
     view::ViewOverlay& GetOverlay (void);
 
@@ -224,6 +225,9 @@ public:
     */
     PageRange GetVisiblePageRange (void);
 
+protected:
+    virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint);
+
 private:
     model::SlideSorterModel& mrModel;
     /// This model is used for the maPage object.
@@ -232,16 +236,22 @@ private:
         pages of the document that is represented by the SlideSorterModel.
     */
     SdrPage* mpPage;
-    std::auto_ptr<Layouter> mpLayouter;
+    ::std::auto_ptr<Layouter> mpLayouter;
     bool mbPageObjectVisibilitiesValid;
-    std::auto_ptr<cache::PageCache> mpPreviewCache;
-    std::auto_ptr<ViewOverlay> mpViewOverlay;
+    ::boost::shared_ptr<cache::PageCache> mpPreviewCache;
+    ::std::auto_ptr<ViewOverlay> mpViewOverlay;
 
     int mnFirstVisiblePageIndex;
     int mnLastVisiblePageIndex;
 
     SvBorder maPagePixelBorder;
 
+    bool mbModelChangedWhileModifyEnabled;
+
+    Size maPreviewSize;
+
+    bool mbPreciousFlagUpdatePending;
+
     /** Adapt the coordinates of the given bounding box according to the
         other parameters.
         @param rModelPageObjectBoundingBox
@@ -271,8 +281,11 @@ private:
         resized as the borders may be device dependent.
     */
     void UpdatePageBorders (void);
+
+    void UpdatePreciousFlags (void);
 };
 
+
 } } } // end of namespace ::sd::slidesorter::view
 
 #endif