renaissance1: merge with DEV300_m84

1 files changed, 2 insertions, 8 deletions

diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 36402cb922a7..1110c3ee130c 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -57,6 +57,7 @@ class LayerTabBar;
 class Ruler;
 class SdUnoDrawView;
 class AnnotationManager;
+class ViewOverlayManager;
 
 #define CHECK_RANGE(nMin, nValue, nMax) ((nValue >= nMin) && (nValue <= nMax))
 
@@ -93,11 +94,6 @@ public:
         PageKind ePageKind = PK_STANDARD,
         FrameView* pFrameView = NULL);
 
-    DrawViewShell(
-        SfxViewFrame* pFrame,
-        ::Window* pParentWindow,
-        const DrawViewShell& rShell);
-
     virtual ~DrawViewShell (void);
 
     virtual void Init (bool bIsMainViewShell);
@@ -198,9 +194,6 @@ public:
     void            ExecFormText(SfxRequest& rReq);
     void            GetFormTextState(SfxItemSet& rSet);
 
-    void            ExecObjPalette(SfxRequest& rReq);
-    void            GetObjPaletteState(SfxItemSet& rSet);
-
     void            ExecAnimationWin(SfxRequest& rReq);
     void            GetAnimationWinState(SfxItemSet& rSet);
 
@@ -497,6 +490,7 @@ private:
     using ViewShell::Notify;
 
     ::std::auto_ptr< AnnotationManager > mpAnnotationManager;
+    ::std::auto_ptr< ViewOverlayManager > mpViewOverlayManager;
 };