Restore FrameworkHelper taskpane URLs.

Change-Id: If14c8784f4ee15f7611d3cbbb04b1a78c9171bf7

sd/source/ui/framework/tools/FrameworkHelper.cxx

@@ -171,6 +171,7 @@ const OUString FrameworkHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane")
 const OUString FrameworkHelper::msFullScreenPaneURL( msPaneURLPrefix + "FullScreenPane");
 const OUString FrameworkHelper::msLeftImpressPaneURL( msPaneURLPrefix + "LeftImpressPane");
 const OUString FrameworkHelper::msLeftDrawPaneURL( msPaneURLPrefix + "LeftDrawPane");
+const OUString FrameworkHelper::msRightPaneURL( msPaneURLPrefix + "RightPane");
 const OUString FrameworkHelper::msSidebarPaneURL( msPaneURLPrefix + "SidebarPane");
 
 
@@ -184,6 +185,7 @@ const OUString FrameworkHelper::msNotesViewURL( msViewURLPrefix + "NotesView");
 const OUString FrameworkHelper::msHandoutViewURL( msViewURLPrefix + "HandoutView");
 const OUString FrameworkHelper::msSlideSorterURL( msViewURLPrefix + "SlideSorter");
 const OUString FrameworkHelper::msPresentationViewURL( msViewURLPrefix + "PresentationView");
+const OUString FrameworkHelper::msTaskPaneURL( msViewURLPrefix + "TaskPane");
 const OUString FrameworkHelper::msSidebarViewURL( msViewURLPrefix + "SidebarView");
 
 
@@ -194,6 +196,7 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
 
 
 // Task panel URLs.
+// FIXME: MMeeks - this set of urls changed:
 const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
 const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
 const OUString FrameworkHelper::msAllMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "AllMasterPages" );

sd/source/ui/inc/PaneChildWindows.hxx

@@ -40,9 +40,6 @@ public:
     virtual ~PaneChildWindow (void);
 };
 
-
-
-
 class LeftPaneImpressChildWindow
     : public PaneChildWindow
 {
@@ -52,9 +49,6 @@ public:
     SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow);
 };
 
-
-
-
 class LeftPaneDrawChildWindow
     : public PaneChildWindow
 {
@@ -64,6 +58,21 @@ public:
     SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow);
 };
 
+class ToolPanelChildWindow : public PaneChildWindow
+                           , public ::sfx2::ITaskPaneToolPanelAccess
+{
+public:
+    ToolPanelChildWindow(
+        ::Window* i_pParentWindow,
+        sal_uInt16 i_nId,
+        SfxBindings* i_pBindings,
+        SfxChildWinInfo* i_pChildWindowInfo );
+
+    SFX_DECL_CHILDWINDOW_WITHID( ToolPanelChildWindow );
+
+    // ::sfx2::ITaskPaneToolPanelAccess
+    virtual void ActivateToolPanel( const OUString& i_rPanelURL );
+};
 
 } // end of namespace ::sd
 

sd/source/ui/inc/framework/FrameworkHelper.hxx

@@ -66,6 +66,7 @@ public:
     static const OUString msFullScreenPaneURL;
     static const OUString msLeftImpressPaneURL;
     static const OUString msLeftDrawPaneURL;
+    static const OUString msRightPaneURL;
     static const OUString msSidebarPaneURL;
 
     // URLs of frequently used views.
@@ -77,6 +78,7 @@ public:
     static const OUString msHandoutViewURL;
     static const OUString msSlideSorterURL;
     static const OUString msPresentationViewURL;
+    static const OUString msTaskPaneURL;
     static const OUString msSidebarViewURL;
 
     // URLs of frequently used tool bars.
@@ -85,6 +87,7 @@ public:
 
     // URLs of task panels.
     static const OUString msTaskPanelURLPrefix;
+    static const OUString msMasterPagesTaskPanelURL;
     static const OUString msAllMasterPagesTaskPanelURL;
     static const OUString msRecentMasterPagesTaskPanelURL;
     static const OUString msUsedMasterPagesTaskPanelURL;