3 files changed, 20 insertions, 11 deletions
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index e107d3af6987..537c62b3d46d 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -127,9 +127,7 @@ public:
         @param pPage
             If a NULL pointer is given then this call is ignored.
     */
-    void AssignLayout (
-        SdPage* pPage,
-        AutoLayout aLayout);
+    void AssignLayout ( SfxRequest& rRequest, PageKind ePageKind );
 
     /** Determine the view id of the view shell.  This corresponds to the
         view id stored in the SfxViewFrame class.
diff --git a/sd/source/ui/inc/layoutdialog.hxx b/sd/source/ui/inc/layoutdialog.hxx
index 6dd427901856..b9d92f8e53f3 100644
--- a/sd/source/ui/inc/layoutdialog.hxx
+++ b/sd/source/ui/inc/layoutdialog.hxx
@@ -31,25 +31,34 @@
 #ifndef SD_LAYOUTDIALOG_HXX
 #define SD_LAYOUTDIALOG_HXX
 
-#include <sfx2/childwin.hxx>
+#include <svx/toolbarmenu.hxx>
+
+#include <svtools/valueset.hxx>
+
+#include <boost/scoped_ptr.hpp>
 
-class SfxViewFrame;
 class ::Window;
-class SfxPopupWindow;
+class ValueSet;
 
 namespace sd {
 
-class LayoutDialogChildWindow : public SfxChildWindow
+class ViewShellBase;
+
+class SdLayoutDialogContent : public ToolbarMenu
 {
 public:
-    LayoutDialogChildWindow ( ::Window*,  USHORT, SfxBindings*, SfxChildWinInfo*);
-    virtual ~LayoutDialogChildWindow (void);
+    SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pParent);
+    virtual ~SdLayoutDialogContent();
 
-    SFX_DECL_CHILDWINDOW(LayerDialogChildWindow);
+protected:
+    DECL_LINK( SelectHdl, void * );
 
-    static SfxPopupWindow* createChildWindow(SfxViewFrame& rViewFrame, ::Window* pParent);
+private:
+    ValueSet* mpLayoutSet;
+    ViewShellBase& mrBase;
 };
 
+
 } // end of namespace sd
 
 #endif
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index c29b8bc5f8fb..0b763d9df058 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -505,6 +505,8 @@
 #define STR_NAVIGATOR_SHOW_ALL_SHAPES                   (RID_APP_START+719)
 #define STR_NAVIGATOR_SHAPE_BASE_NAME                   (RID_APP_START+720)
 
+#define STR_RESET_LAYOUT                                (RID_APP_START+721)
+
 /******************************************************************************
 * The ids in glob.hrc start at RID_APP_START+750!
 ******************************************************************************/