121420: merge sidebar feature from branch into trunk

3 files changed, 5 insertions, 6 deletions

diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 7b1c8c43c479..c3301037488f 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -127,15 +127,14 @@
 #define STR_3DOBJECTBARSHELL                    RID_GLOB_START+104
 #define STR_FONTWORKOBJECTBARSHELL              RID_GLOB_START+105
 #define STR_SLIDESORTERVIEWSHELL                RID_GLOB_START+106
-#define STR_TASKPANEVIEWSHELL                   RID_GLOB_START+107
+#define STR_SIDEBARVIEWSHELL                    RID_GLOB_START+107
 #define STR_MASTERPAGESSELECTOR                 RID_GLOB_START+108
-#define STR_TASKPANELAYOUTMENU                  RID_GLOB_START+109
+#define STR_SIDEBAR_LAYOUTMENU                  RID_GLOB_START+109
 #define STR_MEDIAOBJECTBARSHELL                 RID_GLOB_START+110
 #define STR_PAGE_NAME                           RID_GLOB_START+111
 #define STR_SLIDE_NAME                          RID_GLOB_START+112
 #define STR_LEFT_IMPRESS_PANE_SHELL             RID_GLOB_START+113
 #define STR_LEFT_DRAW_PANE_SHELL                RID_GLOB_START+114
-#define STR_RIGHT_PANE_SHELL                    RID_GLOB_START+115
 #define STR_TOOL_PANEL_SHELL                    RID_GLOB_START+116
 
 #define RID_CUSTOMANIMATION_START               RID_GLOB_START+120
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 1075494bc6cd..ba6ba2caedf5 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -53,7 +53,7 @@
 #define SD_IF_SD3DOBJECTBAR             SFX_INTERFACE_SD_START + 17
 #define SD_IF_SDFONTWORKOBJECTBAR       SFX_INTERFACE_SD_START + 18
 #define SD_IF_SDSLIDESORTERVIEWSHELL    SFX_INTERFACE_SD_START + 19
-#define SD_IF_SDTASKPANEVIEWSHELL       SFX_INTERFACE_SD_START + 20
+#define SD_IF_SDSIDEBARVIEWSHELL        SFX_INTERFACE_SD_START + 20
 #define SD_IF_SDMASTERPAGESSELECTOR     SFX_INTERFACE_SD_START + 21
 #define SD_IF_SDLAYOUTMENU              SFX_INTERFACE_SD_START + 22
 #define SD_IF_SDDRAWMEDIAOBJECTBAR      SFX_INTERFACE_SD_START + 23
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 932cf0c39826..ead17cc3aeb5 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -51,7 +51,7 @@ class SfxObjectShell;
 class SfxObjectShellLock;
 class SvxFieldData;
 class GDIMetaFile;
-class XColorTable;
+class XColorList;
 class SdDrawDocument;
 class SfxMedium;
 class SdrObject;
@@ -182,7 +182,7 @@ public:
     static SdAbstractDialogFactory*     Create();
 
     virtual VclAbstractDialog*          CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0;
-    virtual AbstractCopyDlg*            CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorTable* pColTab, ::sd::View* pView ) = 0;
+    virtual AbstractCopyDlg*            CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, XColorList* pColTab, ::sd::View* pView ) = 0;
     virtual AbstractSdCustomShowDlg*    CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0;
     virtual SfxAbstractTabDialog*       CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0;
     virtual SfxAbstractTabDialog*       CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) = 0;