slidecopy: merge CWS wth MWS-m76

3 files changed, 5 insertions, 6 deletions

diff --git a/sd/sdi/TaskPaneViewShell.sdi b/sd/sdi/ToolPanelViewShell.sdi
index 22f0fba21265..a72342c52da5 100644
--- a/sd/sdi/TaskPaneViewShell.sdi
+++ b/sd/sdi/ToolPanelViewShell.sdi
@@ -1,5 +1,4 @@
 /*************************************************************************
- *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,7 +22,7 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/
+************************************************************************/
 
 SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES
 [
@@ -302,7 +301,7 @@ shell LayoutMenu
     import TaskPaneLayoutMenuInterface[Automation];
 }
 
-shell TaskPaneViewShell
+shell ToolPanelViewShell
 {
 }
 
diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk
index ab128c378afc..a950aad5d7a5 100644
--- a/sd/sdi/makefile.mk
+++ b/sd/sdi/makefile.mk
@@ -66,7 +66,7 @@ SVSDI1DEPEND= \
     outlnvsh.sdi \
     SlideSorterController.sdi \
     ViewShellBase.sdi \
-    TaskPaneViewShell.sdi \
+    ToolPanelViewShell.sdi \
     sdslots.hrc \
     $(PRJ)$/inc$/app.hrc
 
@@ -88,7 +88,7 @@ SVSDI2DEPEND= \
         mediaob.sdi \
     outlnvsh.sdi \
     ViewShellBase.sdi \
-    TaskPaneViewShell.sdi \
+    ToolPanelViewShell.sdi \
     sdslots.hrc \
     $(PRJ)$/inc$/app.hrc
 
diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi
index 21e60e6a1a79..fbfc8da1903b 100644
--- a/sd/sdi/sdslots.sdi
+++ b/sd/sdi/sdslots.sdi
@@ -104,5 +104,5 @@ ModulePrefix( "Sd" )
         include "ViewShellBase.sdi"
         include "mediaob.sdi"
         include "tables.sdi"
-        include "TaskPaneViewShell.sdi"
+        include "ToolPanelViewShell.sdi"
 }