Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 10 insertions, 9 deletions

diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index a72e8ecbc9fc..f8e0bdb03e85 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -58,7 +58,8 @@ public:
         SfxViewFrame* pFrame,
         ViewShellBase& rViewShellBase,
         ::Window* pParentWindow,
-        FrameView* pFrameView);
+        FrameView* pFrameView,
+        const bool bIsCenterPane);
 
     virtual ~SlideSorterViewShell (void);
 
@@ -107,9 +108,6 @@ public:
     virtual void SetZoom (long int nZoom);
     virtual void SetZoomRect (const Rectangle& rZoomRect);
 
-    /// forward VCLs PrePaint window event to DrawingLayer
-    virtual void PrePaint();
-
     /** This is a callback method used by the active window to delegate its
         Paint() call to.  This view shell itself delegates it to the view.
     */
@@ -121,6 +119,8 @@ public:
     */
     virtual void ArrangeGUIElements (void);
 
+    virtual void Activate (sal_Bool IsMDIActivate);
+
     //===== Drag and Drop =====================================================
 
     virtual void StartDrag (
@@ -132,14 +132,14 @@ public:
         const AcceptDropEvent& rEvt,
         DropTargetHelper& rTargetHelper,
         ::sd::Window* pTargetWindow = NULL,
-        USHORT nPage = SDRPAGE_NOTFOUND,
-        USHORT nLayer = SDRPAGE_NOTFOUND );
+        sal_uInt16 nPage = SDRPAGE_NOTFOUND,
+        sal_uInt16 nLayer = SDRPAGE_NOTFOUND );
     virtual sal_Int8 ExecuteDrop (
         const ExecuteDropEvent& rEvt,
         DropTargetHelper& rTargetHelper,
         ::sd::Window* pTargetWindow = NULL,
-        USHORT nPage = SDRPAGE_NOTFOUND,
-        USHORT nLayer = SDRPAGE_NOTFOUND);
+        sal_uInt16 nPage = SDRPAGE_NOTFOUND,
+        sal_uInt16 nLayer = SDRPAGE_NOTFOUND);
 
     typedef ::std::vector<SdPage*> PageSelection;
 
@@ -193,10 +193,11 @@ protected:
     /** This method is overloaded to handle a missing tool bar correctly.
         This is the case when the slide sorter is not the main view shell.
     */
-    virtual SfxUndoManager* ImpGetUndoManager (void) const;
+    virtual ::svl::IUndoManager* ImpGetUndoManager (void) const;
 
 private:
     ::boost::shared_ptr<SlideSorter> mpSlideSorter;
+    bool mbIsArrangeGUIElementsPending;
 
     SlideSorterViewShell (
         SfxViewFrame* pFrame,