INTEGRATION: CWS impress51 (1.6.46); FILE MERGED

2005/06/20 12:45:59 af 1.6.46.2: #i50712# Added support for keyboard driven context menu.
2005/05/24 09:26:33 af 1.6.46.1: #i49735# Made AssignMasterPageToPageList() protected.

1 files changed, 14 insertions, 12 deletions

diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
index fa1b5a617fa1..18e69c250939 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MasterPagesSelector.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2005-03-18 17:02:05 $
+ *  last change: $Author: kz $ $Date: 2005-07-14 10:25:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -229,15 +229,7 @@ protected:
 
     DECL_LINK(ProcessPreviewUpdateRequest, Timer*);
 
-private:
-    DECL_LINK(ClickHandler, PreviewValueSet*);
-    DECL_LINK(RightClickHandler, MouseEvent*);
-
-    static void ProvideStyles (
-        SdDrawDocument* pSourceDoc,
-        SdDrawDocument* pTargetDoc,
-        SdPage* pPage);
-
+protected:
     /** Assign the given master page to the list of pages.
         @param pMasterPage
             This master page will usually be a member of the list of all
@@ -246,10 +238,20 @@ private:
             The pages to which to assign the master page.  These pages may
             be slides or master pages themselves.
     */
-    void AssignMasterPageToPageList (
+    virtual void AssignMasterPageToPageList (
         SdPage* pMasterPage,
         const ::std::vector<SdPage*>& rPageList);
 
+private:
+    DECL_LINK(ClickHandler, PreviewValueSet*);
+    DECL_LINK(RightClickHandler, MouseEvent*);
+    DECL_LINK(ContextMenuCallback, CommandEvent*);
+
+    static void ProvideStyles (
+        SdDrawDocument* pSourceDoc,
+        SdDrawDocument* pTargetDoc,
+        SdPage* pPage);
+
     /** Assign the given master page to the given page.
         @param pMasterPage
             In contrast to AssignMasterPageToPageList() this page is assumed