1 files changed, 47 insertions, 24 deletions

diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 8193ae3004d2..926d579e93e9 100644..100755
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -47,11 +47,11 @@
 #include "DrawController.hxx"
 #include "FactoryIds.hxx"
 #include "slideshow.hxx"
-#include "TaskPaneViewShell.hxx"
 #include "ViewShellBase.hxx"
 #include "FrameView.hxx"
 #include "DrawViewShell.hxx"
 #include "ViewShellHint.hxx"
+#include "taskpane/PanelId.hxx"
 #include "framework/FrameworkHelper.hxx"
 
 #include <sfx2/bindings.hxx>
@@ -195,12 +195,12 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
             // Make the layout menu visible in the tool pane.
             SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, TRUE);
             SfxUInt32Item aPanelId (ID_VAL_PANEL_INDEX,
-                ::sd::toolpanel::TaskPaneViewShell::PID_LAYOUT);
+                ::sd::toolpanel::PID_LAYOUT);
             SfxViewFrame* pFrame = mrViewShell.GetViewFrame();
             if (pFrame!=NULL && pFrame->GetDispatcher()!=NULL)
             {
                 pFrame->GetDispatcher()->Execute (
-                    SID_TASK_PANE,
+                    SID_SHOW_TOOL_PANEL,
                     SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
                     &aMakeToolPaneVisible,
                     &aPanelId,
@@ -319,30 +319,53 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
     rRequest.Done ();
 }
 
+void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind ePageKind )
+{
+    const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item*  > ( rRequest.GetArg( ID_VAL_WHATPAGE, FALSE, TYPE(SfxUInt32Item) ) );
+    const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item*  > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, FALSE, TYPE(SfxUInt32Item) ) );
+
+    SdDrawDocument* pDocument = mrViewShell.GetDoc();
+    if( !pDocument )
+        return;
+
+    SdPage* pPage = 0;
+    if( pWhatPage )
+    {
+        pPage = pDocument->GetSdPage(static_cast<USHORT>(pWhatPage->GetValue()), ePageKind);
+    }
 
+    if( pPage == 0 )
+        pPage = mrViewShell.getCurrentPage();
 
+    if( pPage )
+    {
+        AutoLayout eLayout = pPage->GetAutoLayout();
 
-void ViewShell::Implementation::AssignLayout (
-    SdPage* pPage,
-    AutoLayout aLayout)
-{
-    // Transform the given request into the four argument form that is
-    // understood by ProcessModifyPageSlot().
-    SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin());
-    BYTE aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE));
-    BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE));
-    SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers());
-    SfxRequest aRequest (mrViewShell.GetViewShellBase().GetViewFrame(), SID_MODIFYPAGE);
-    aRequest.AppendItem(SfxStringItem (ID_VAL_PAGENAME, pPage->GetName()));
-    aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout));
-    aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground)));
-    aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEOBJ, aVisibleLayers.IsSet(aBackgroundObject)));
-
-    // Forward the call with the new arguments.
-    ProcessModifyPageSlot (
-        aRequest,
-        pPage,
-        pPage->GetPageKind());
+        if( pWhatLayout )
+            eLayout = static_cast< AutoLayout >( pWhatLayout->GetValue() );
+
+        // Transform the given request into the four argument form that is
+        // understood by ProcessModifyPageSlot().
+        SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin());
+        BYTE aBackground (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE));
+        BYTE aBackgroundObject (rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE));
+
+        SetOfByte aVisibleLayers;
+
+        if( pPage->GetPageKind() == PK_HANDOUT )
+            aVisibleLayers.SetAll();
+        else
+            aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
+
+        SfxRequest aRequest (mrViewShell.GetViewShellBase().GetViewFrame(), SID_MODIFYPAGE);
+        aRequest.AppendItem(SfxStringItem (ID_VAL_PAGENAME, pPage->GetName()));
+        aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, eLayout));
+        aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground)));
+        aRequest.AppendItem(SfxBoolItem(ID_VAL_ISPAGEOBJ, aVisibleLayers.IsSet(aBackgroundObject)));
+
+        // Forward the call with the new arguments.
+        ProcessModifyPageSlot( aRequest, pPage, pPage->GetPageKind());
+    }
 }