slidecopy: merge CWS wth MWS-m76

1 files changed, 10 insertions, 16 deletions

diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 2e8032926846..bb1023482ea0 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -109,36 +109,30 @@ LeftDrawPaneShell::~LeftDrawPaneShell (void)
 
 
 
-//===== RightPaneShell ========================================================
+//===== ToolPanelPaneShell ========================================================
 
 #undef ShellClass
-#define ShellClass RightPaneShell
+#define ShellClass ToolPanelPaneShell
 
-SFX_SLOTMAP(RightPaneShell)
+SFX_SLOTMAP( ToolPanelPaneShell )
 {
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-SFX_IMPL_INTERFACE(RightPaneShell, SfxShell, SdResId(STR_RIGHT_PANE_SHELL))
+SFX_IMPL_INTERFACE( ToolPanelPaneShell, SfxShell, SdResId( STR_TOOL_PANEL_SHELL ) )
 {
-    SFX_CHILDWINDOW_REGISTRATION(
-        ::sd::RightPaneChildWindow::GetChildWindowId());
+    SFX_CHILDWINDOW_REGISTRATION( ::sd::ToolPanelChildWindow::GetChildWindowId() );
 }
 
-TYPEINIT1(RightPaneShell, SfxShell);
-
+TYPEINIT1( ToolPanelPaneShell, SfxShell );
 
-
-RightPaneShell::RightPaneShell (void)
-    : SfxShell()
+ToolPanelPaneShell::ToolPanelPaneShell()
+    :SfxShell()
 {
-    SetName(rtl::OUString::createFromAscii("RightPane"));
+    SetName( ::rtl::OUString::createFromAscii( "ToolPanel" ) );
 }
 
-
-
-
-RightPaneShell::~RightPaneShell (void)
+ToolPanelPaneShell::~ToolPanelPaneShell(void)
 {
 }