1 files changed, 26 insertions, 20 deletions

diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 667aa768ee8f..b6309f80d0b4 100755
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -37,7 +37,6 @@
 #include <sfx2/viewfac.hxx>
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
-#include <memory>
 #include <comphelper/implementationreference.hxx>
 
 namespace sd { namespace slidesorter {
@@ -61,12 +60,15 @@ class Animator;
 class Clipboard;
 class CurrentSlideManager;
 class FocusManager;
+class InsertionIndicatorHandler;
 class Listener;
 class PageSelector;
-class Properties;
 class ScrollBarManager;
+class SelectionFunction;
 class SelectionManager;
+class SelectionObserver;
 class SlotManager;
+class VisibleAreaManager;
 
 class SlideSorterController
 {
@@ -85,6 +87,8 @@ public:
 
     virtual ~SlideSorterController (void);
 
+    void Dispose (void);
+
     /** Place and size the scroll bars and the browser window so that the
         given rectangle is filled.
         @return
@@ -106,7 +110,8 @@ public:
     Rectangle Rearrange (bool bForce = false);
 
     /** Return the descriptor of the page that is rendered under the
-        given position.
+        given position.  This takes the IsOnlyPreviewTriggersMouseOver
+        property into account.
         @return
             Returns a pointer to a page descriptor instead of a
             reference because when no page is found at the position
@@ -125,9 +130,7 @@ public:
     ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager (void) const;
     ::boost::shared_ptr<SlotManager> GetSlotManager (void) const;
     ::boost::shared_ptr<SelectionManager> GetSelectionManager (void) const;
-
-    // forward VCLs PrePaint window event to DrawingLayer
-    void PrePaint();
+    ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler (void) const;
 
     /** This method forwards the call to the SlideSorterView and executes
         pending operations like moving selected pages into the visible area.
@@ -183,6 +186,12 @@ public:
     */
     virtual FunctionReference CreateSelectionFunction (SfxRequest& rRequest);
 
+    /** When the current function of the view shell is the slide sorter
+        selection function then return a reference to it.  Otherwise return
+        an empty reference.
+    */
+    ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction (void);
+
     /** Prepare for a change of the edit mode.  Depending on the current
         edit mode we may save the selection so that it can be restored when
         later changing back to the current edit mode.
@@ -219,11 +228,6 @@ public:
     */
     bool IsContextMenuOpen (void) const;
 
-    /** Return a collection of properties that are used througout the slide
-        sorter.
-    */
-    ::boost::shared_ptr<Properties> GetProperties (void) const;
-
     /** Provide the set of pages to be displayed in the slide sorter.  The
         GetDocumentSlides() method can be found only in the SlideSorterModel.
     */
@@ -233,18 +237,24 @@ public:
     */
     ::boost::shared_ptr<Animator> GetAnimator (void) const;
 
+    VisibleAreaManager& GetVisibleAreaManager (void) const;
+
+    void CheckForMasterPageAssignment (void);
+
 private:
     SlideSorter& mrSlideSorter;
     model::SlideSorterModel& mrModel;
     view::SlideSorterView& mrView;
-    ::std::auto_ptr<PageSelector> mpPageSelector;
-    ::std::auto_ptr<FocusManager> mpFocusManager;
+    ::boost::scoped_ptr<PageSelector> mpPageSelector;
+    ::boost::scoped_ptr<FocusManager> mpFocusManager;
     ::boost::shared_ptr<SlotManager> mpSlotManager;
-    ::std::auto_ptr<controller::Clipboard> mpClipboard;
-    ::std::auto_ptr<ScrollBarManager> mpScrollBarManager;
+    ::boost::scoped_ptr<controller::Clipboard> mpClipboard;
+    ::boost::scoped_ptr<ScrollBarManager> mpScrollBarManager;
     mutable ::boost::shared_ptr<CurrentSlideManager> mpCurrentSlideManager;
     ::boost::shared_ptr<SelectionManager> mpSelectionManager;
+    ::boost::shared_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler;
     ::boost::shared_ptr<Animator> mpAnimator;
+    ::boost::scoped_ptr<VisibleAreaManager> mpVisibleAreaManager;
 
     // The listener listens to UNO events and thus is a UNO object.
     // For proper life time management and at the same time free access to
@@ -252,6 +262,7 @@ private:
     ::rtl::Reference<controller::Listener> mpListener;
 
     int mnModelChangeLockCount;
+    bool mbIsForcedRearrangePending;
 
     bool mbPreModelChangeDone;
     bool mbPostModelChangePending;
@@ -286,11 +297,6 @@ private:
     */
     bool mbIsContextMenuOpen;
 
-    /** Some slide sorter wide properties that are used in different
-        classes.
-    */
-    ::boost::shared_ptr<Properties> mpProperties;
-
     /** Delete the given list of normal pages.  This method is a helper
         function for DeleteSelectedPages().
         @param rSelectedNormalPages