slidecopy: now using SID_TASK_PANE in all applications, also in Impress.

Implies registering the respective child window in the apps, not in SFX. Also implies getting rid of SID_RIGHT_PANE
in Impress.
Also, renamed SID_TASK_PANE in Impress to SID_SHOW_TOOL_PANEL, which better fits its purpose, and avoids confusion
with SID_TASKPANE.

9 files changed, 21 insertions, 42 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 53223fa5ff1b..65aec562f084 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -430,7 +430,7 @@
 
 #define SID_LEFT_PANE_IMPRESS               (SID_SD_START+414)
 #define SID_LEFT_PANE_DRAW                  (SID_SD_START+415)
-#define SID_RIGHT_PANE                      (SID_SD_START+416)
+    // FREE
 #define SID_NOTES_WINDOW                    (SID_SD_START+417)
 #define SID_SWITCH_SHELL_PANE               (SID_SD_START+418)
 #define SID_LAYER_DIALOG_WIN                (SID_SD_START+419)
@@ -446,7 +446,7 @@
 #define SID_TP_USE_FOR_NEW_PRESENTATIONS    (SID_SD_START+427)
 #define SID_TP_SHOW_LARGE_PREVIEW           (SID_SD_START+428)
 #define SID_TP_SHOW_SMALL_PREVIEW           (SID_SD_START+429)
-#define SID_TASK_PANE                       (SID_SD_START+430)
+#define SID_SHOW_TOOL_PANEL                 (SID_SD_START+430)
 #define SID_INSERT_MASTER_PAGE              (SID_SD_START+431)
 #define SID_DELETE_MASTER_PAGE              (SID_SD_START+432)
 #define SID_RENAME_MASTER_PAGE              (SID_SD_START+433)
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index e9cb7119fa89..3602e711db1b 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -135,32 +135,6 @@ SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW
     GroupId = GID_MODIFY;
 ]
 
-SfxBoolItem RightPane SID_RIGHT_PANE
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_MODIFY;
-]
-
 SfxVoidItem NotesChildWindow SID_NOTES_WINDOW
 
 [
@@ -239,7 +213,7 @@ SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI
     GroupId = GID_MODIFY;
 ]
 
-SfxVoidItem TaskPaneShowPanel SID_TASK_PANE (
+SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL (
     SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE,
     SfxUInt32Item PanelId ID_VAL_PANEL_INDEX)
 [
@@ -280,7 +254,7 @@ interface ViewShellBaseView
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_RIGHT_PANE
+    SID_TASKPANE
     [
         ExecMethod = Execute;
         StateMethod = GetState;
@@ -325,7 +299,7 @@ interface ViewShellBaseView
         ExecMethod = Execute;
         StateMethod = GetState;
     ]
-    SID_TASK_PANE
+    SID_SHOW_TOOL_PANEL
     [
         ExecMethod = Execute;
         StateMethod = GetState;
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index ac2cc083b4fb..26ad4436b7c1 100755
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -45,7 +45,7 @@ namespace sd {
 
 SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
 SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
-SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_RIGHT_PANE)
+SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE)
 
 //===== PaneChildWindow =======================================================
 
diff --git a/sd/source/ui/toolpanel/ToolPanelFactory.cxx b/sd/source/ui/toolpanel/ToolPanelFactory.cxx
index a0315ed30fd0..db4602c991d0 100644
--- a/sd/source/ui/toolpanel/ToolPanelFactory.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelFactory.cxx
@@ -172,7 +172,7 @@ namespace sd { namespace toolpanel
             }
         }
 
-        if ( !pViewFrame || !pViewFrame->HasChildWindow( SID_RIGHT_PANE ) )
+        if ( !pViewFrame || !pViewFrame->HasChildWindow( SID_TASKPANE ) )
             throw IllegalArgumentException(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal frame." ) ),
                 *this,
@@ -180,7 +180,7 @@ namespace sd { namespace toolpanel
             );
 
         // retrieve the task pane
-        ToolPanelChildWindow* pToolPanelWindow( dynamic_cast< ToolPanelChildWindow* >( pViewFrame->GetChildWindow( SID_RIGHT_PANE ) ) );
+        ToolPanelChildWindow* pToolPanelWindow( dynamic_cast< ToolPanelChildWindow* >( pViewFrame->GetChildWindow( SID_TASKPANE ) ) );
         if ( !pToolPanelWindow )
             throw IllegalArgumentException(
                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "No Impress document, or no Impress Task Pane." ) ),
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 26cb270950f3..0d7eeea99190 100755
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -34,6 +34,7 @@
 #include "taskpane/TaskPaneControlFactory.hxx"
 #include "controls/MasterPagesPanel.hxx"
 #include "LayoutMenu.hxx"
+#include "DrawDocShell.hxx"
 #include "controls/TableDesignPanel.hxx"
 #include "controls/CustomAnimationPanel.hxx"
 #include "controls/SlideTransitionPanel.hxx"
@@ -366,9 +367,13 @@ TYPEINIT1(ToolPanelViewShell, ViewShell);
 // ---------------------------------------------------------------------------------------------------------------------
 ToolPanelViewShell_Impl::InitialPanel ToolPanelViewShell_Impl::impl_determineInitialPanel()
 {
+    InitialPanel aPanelToActivate;
+    if ( GetAntiImpl().GetViewShellBase().GetDocShell()->GetDocumentType() == DOCUMENT_TYPE_DRAW )
+        // for Draw, rely on SFX's default handling, which is to activate the previously active panel
+        return aPanelToActivate;
+
     // Default to Layout panel, but check whether the requested configuration already contains a tool panel, in this case,
     // use that one.
-    InitialPanel aPanelToActivate;
     aPanelToActivate.sPanelResourceURL = FrameworkHelper::msLayoutTaskPanelURL;
     aPanelToActivate.bActivateDirectly = false;
     try
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 38409bb2376e..759103760bfe 100644
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -100,18 +100,18 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest)
 
     switch (nSlotId)
     {
-        case SID_RIGHT_PANE:
         case SID_NOTES_WINDOW:
         case SID_SLIDE_SORTER_MULTI_PANE_GUI:
         case SID_DIAMODE:
         case SID_OUTLINEMODE:
         case SID_NOTESMODE:
         case SID_HANDOUTMODE:
-        case SID_TASK_PANE:
+        case SID_SHOW_TOOL_PANEL:
             // Prevent some Impress-only slots from being executed.
             rRequest.Cancel();
             break;
 
+        case SID_TASKPANE:
         case SID_SWITCH_SHELL:
         case SID_LEFT_PANE_DRAW:
         case SID_LEFT_PANE_IMPRESS:
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 643025b2b80b..9ffde2a7a331 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -809,7 +809,7 @@ void ViewShellBase::Execute (SfxRequest& rRequest)
                 framework::FrameworkHelper::msSlideSorterURL);
             break;
 
-        case SID_RIGHT_PANE:
+        case SID_TASKPANE:
             mpImpl->SetPaneVisibility(
                 rRequest,
                 framework::FrameworkHelper::msRightPaneURL,
@@ -830,7 +830,7 @@ void ViewShellBase::Execute (SfxRequest& rRequest)
             // The full screen mode is not supported.  Ignore the request.
             break;
 
-        case SID_TASK_PANE:
+        case SID_SHOW_TOOL_PANEL:
             mpImpl->ProcessTaskPaneSlot(rRequest);
             break;
 
@@ -1535,7 +1535,7 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
                             xContext, FrameworkHelper::msLeftDrawPaneURL);
                         break;
 
-                    case SID_RIGHT_PANE:
+                    case SID_TASKPANE:
                         xResourceId = ResourceId::create(
                             xContext, FrameworkHelper::msRightPaneURL);
                         break;
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index be30956dd5f4..c7166451a78f 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -200,7 +200,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
             if (pFrame!=NULL && pFrame->GetDispatcher()!=NULL)
             {
                 pFrame->GetDispatcher()->Execute (
-                    SID_TASK_PANE,
+                    SID_SHOW_TOOL_PANEL,
                     SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
                     &aMakeToolPaneVisible,
                     &aPanelId,
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 5b79fdd1f098..3cf5193fdffa 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -99,7 +99,7 @@
                 </menu:menupopup>
             </menu:menu>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:RightPane"/>
+      <menu:menuitem menu:id=".uno:TaskPane"/>
       <menu:menuitem menu:id=".uno:LeftPaneImpress"/>
             <menu:menuitem menu:id=".uno:AvailableToolbars"/>
             <menu:menuitem menu:id=".uno:StatusBarVisible"/>