Update from master repository (DEV300_m98).

10 files changed, 596 insertions, 273 deletions

diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx
index 66477a1faf67..4f2346942fc9 100644..100755
--- a/sd/inc/FactoryIds.hxx
+++ b/sd/inc/FactoryIds.hxx
@@ -42,8 +42,7 @@ enum ViewShellFactoryIds
     DRAW_FACTORY_ID = 1,
     SLIDE_SORTER_FACTORY_ID = 2,
     OUTLINE_FACTORY_ID = 3,
-    PRESENTATION_FACTORY_ID = 4,
-    PREVIEW_FACTORY_ID = 5
+    PRESENTATION_FACTORY_ID = 4
 };
 
 } // end of namespace sd
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 65aec562f084..9a18f184363b 100755
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -32,6 +32,50 @@
 #include <sfx2/sfx.hrc>
 #endif
 
+// HelpIDs fuer Vorlagen
+#define HID_STANDARD_STYLESHEET_NAME        (HID_SD_START + 70)
+#define HID_POOLSHEET_OBJWITHARROW          (HID_SD_START + 71)
+#define HID_POOLSHEET_OBJWITHSHADOW         (HID_SD_START + 72)
+#define HID_POOLSHEET_OBJWITHOUTFILL        (HID_SD_START + 73)
+#define HID_POOLSHEET_TEXT                  (HID_SD_START + 74)
+#define HID_POOLSHEET_TEXTBODY              (HID_SD_START + 75)
+#define HID_POOLSHEET_TEXTBODY_JUSTIFY      (HID_SD_START + 76)
+#define HID_POOLSHEET_TEXTBODY_INDENT       (HID_SD_START + 77)
+#define HID_POOLSHEET_TITLE                 (HID_SD_START + 78)
+#define HID_POOLSHEET_TITLE1                (HID_SD_START + 79)
+#define HID_POOLSHEET_TITLE2                (HID_SD_START + 80)
+#define HID_POOLSHEET_HEADLINE              (HID_SD_START + 81)
+#define HID_POOLSHEET_HEADLINE1             (HID_SD_START + 82)
+#define HID_POOLSHEET_HEADLINE2             (HID_SD_START + 83)
+#define HID_POOLSHEET_MEASURE               (HID_SD_START + 84)
+#define HID_PSEUDOSHEET_TITLE               (HID_SD_START + 85)
+#define HID_PSEUDOSHEET_OUTLINE             (HID_SD_START + 86)
+#define HID_PSEUDOSHEET_OUTLINE1            (HID_SD_START + 87)
+#define HID_PSEUDOSHEET_OUTLINE2            (HID_SD_START + 88)
+#define HID_PSEUDOSHEET_OUTLINE3            (HID_SD_START + 89)
+#define HID_PSEUDOSHEET_OUTLINE4            (HID_SD_START + 90)
+#define HID_PSEUDOSHEET_OUTLINE5            (HID_SD_START + 91)
+#define HID_PSEUDOSHEET_OUTLINE6            (HID_SD_START + 92)
+#define HID_PSEUDOSHEET_OUTLINE7            (HID_SD_START + 93)
+#define HID_PSEUDOSHEET_OUTLINE8            (HID_SD_START + 94)
+#define HID_PSEUDOSHEET_OUTLINE9            (HID_SD_START + 95)
+#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS   (HID_SD_START + 96)
+#define HID_PSEUDOSHEET_BACKGROUND          (HID_SD_START + 97)
+#define HID_PSEUDOSHEET_NOTES               (HID_SD_START + 98)
+#define HID_PSEUDOSHEET_SUBTITLE            (HID_SD_START + 101)
+
+#define HID_SD_CELL_STYLE_DEFAULT                           (HID_SD_START + 194)
+#define HID_SD_CELL_STYLE_BANDED                            (HID_SD_START + 195)
+#define HID_SD_CELL_STYLE_HEADER                            (HID_SD_START + 196)
+#define HID_SD_CELL_STYLE_TOTAL                             (HID_SD_START + 197)
+#define HID_SD_CELL_STYLE_FIRST_COLUMN                      (HID_SD_START + 198)
+#define HID_SD_CELL_STYLE_LAST_COLUMN                       (HID_SD_START + 199)
+
+#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT    (HID_SD_START + 174)
+#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT     (HID_SD_START + 175)
+#define SHELLID_SD_TASK_PANE_PREVIEW_ALL        (HID_SD_START + 176)
+#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS    (HID_SD_START + 177)
+
 #define SID_BACKGROUND                      (SID_SD_START)
 #define SID_LASTVERSION                     (SID_SD_START+1)
 #define SID_PAGESETUP                       (SID_SD_START+2)
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 6811da762934..7cdee6a4efa5 100755
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -493,6 +493,9 @@ public:
             This flag indicates whether to show the background shape.
         @param bIsPageObj
             This flag indicates whether to show the shapes on the master page.
+        @param nInsertPosition
+            Position where to insert the standard page.  When -1 then the
+            new page set is inserted after the current page.
 
         @return
             Returns an index of the inserted pages that can be used with the
@@ -506,7 +509,8 @@ public:
         AutoLayout eStandardLayout,
         AutoLayout eNotesLayout,
         BOOL bIsPageBack,
-        BOOL bIsPageObj);
+        BOOL bIsPageObj,
+        const sal_Int32 nInsertPosition = -1);
 
     /** This method acts as a simplified front end for the more complex
         <member>DuplicatePage()</member> method.
@@ -549,6 +553,9 @@ public:
             This flag indicates whether to show the background shape.
         @param bIsPageObj
             This flag indicates whether to show the shapes on the master page.
+        @param nInsertPosition
+            Position where to insert the standard page.  When -1 then the
+            new page set is inserted after the current page.
 
         @return
             Returns an index of the inserted pages that can be used with the
@@ -562,7 +569,8 @@ public:
         AutoLayout eStandardLayout,
         AutoLayout eNotesLayout,
         BOOL bIsPageBack,
-        BOOL bIsPageObj);
+        BOOL bIsPageObj,
+        const sal_Int32 nInsertPosition = -1);
 
     /** return the document fonts for latin, cjk and ctl according to the current
         languages set at this document */
@@ -620,6 +628,9 @@ private:
             The standard page to insert.
         @param pNotesPage
             The notes page to insert.
+        @param nInsertPosition
+            Position where to insert the standard page.  When -1 then the
+            new page set is inserted after the current page.
 
         @return
             Returns an index of the inserted pages that can be used with the
@@ -634,9 +645,9 @@ private:
         AutoLayout eNotesLayout,
         BOOL bIsPageBack,
         BOOL bIsPageObj,
-
         SdPage* pStandardPage,
-        SdPage* pNotesPage);
+        SdPage* pNotesPage,
+        sal_Int32 nInsertPosition = -1);
 
     /** Set up a newly created page and insert it into the list of pages.
         @param pPreviousPage
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index 73189f135e62..89b2b670adf9 100755
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -154,5 +154,7 @@
 #define STR_CUSTOMANIMATIONPANE                 RID_GLOB_START+227
 #define STR_SLIDE_TRANSITION_PANE               RID_GLOB_START+228
 
+#define RID_SLIDESORTER_ICONS                   RID_GLOB_START+227
+
 
 
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index b693ebe6fd2c..b01009f159d6 100644..100755
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -24,258 +24,228 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
-#define HID_SD_PRINT_OPTIONS       (HID_SD_START + 0)
-#define HID_SD_OPTIONS_SNAP        (HID_SD_START + 1)
-#define HID_SD_OPTIONS_VIEW        (HID_SD_START + 2)
-
-#define HID_SD_AUTOPILOT_PAGE1     (HID_SD_START + 3)
-#define HID_SD_AUTOPILOT_PAGE2     (HID_SD_START + 4)
-#define HID_SD_AUTOPILOT_PAGE3     (HID_SD_START + 5)
-#define HID_SD_AUTOPILOT_PAGE4     (HID_SD_START + 6)
-#define HID_SD_AUTOPILOT_PAGE5     (HID_SD_START + 7)
-#define HID_SD_AUTOPILOT_PAGE6     (HID_SD_START + 8)
-
-#define HID_SD_CBX_ONLYSELECTED    (HID_SD_START + 9)
-#define HID_SD_BTN_FILTERDIALOG    (HID_SD_START + 10)
-
-#define HID_SD_BTN_PAGE            (HID_SD_START + 11)
-#define HID_SD_BTN_MASTERPAGE      (HID_SD_START + 12)
-#define HID_SD_BTN_LAYER           (HID_SD_START + 13)
-
-#define HID_SD_BTN_DRAW            (HID_SD_START + 14)
-#define HID_SD_BTN_SLIDE           (HID_SD_START + 15)
-#define HID_SD_BTN_OUTLINE         (HID_SD_START + 16)
-#define HID_SD_BTN_NOTES           (HID_SD_START + 17)
-#define HID_SD_BTN_HANDOUT         (HID_SD_START + 18)
-
-#define HID_SD_WIN_DOCUMENT        (HID_SD_START + 19)
-
-#define HID_SD_OPTIONS_LAYOUT      (HID_SD_START + 20)
-#define HID_SD_OPTIONS_CONTENTS    (HID_SD_START + 21)
-#define HID_SD_OPTIONS_MISC        (HID_SD_START + 22)
-
-#define HID_SD_EFFECT_PREVIEW       (HID_SD_START + 23)
-#define HID_SD_CTL_NEWFOIL          (HID_SD_START + 24)
-#define HID_SD_NAVIGATOR_TLB        (HID_SD_START + 25)
-#define HID_SD_NAVIGATOR            (HID_SD_START + 26)
-
-#define HID_SD_CTL_EFFECTS          (HID_SD_START + 27)
-#define HID_SD_CTL_TEXT_EFFECTS     (HID_SD_START + 28)
-
-#define HID_SD_CTL_SLIDE_CHANGE     (HID_SD_START + 29)
-
-#define HID_SD_NAVIGATOR_TBX        (HID_SD_START + 30)
-#define HID_SD_NAVIGATOR_LB         (HID_SD_START + 31)
-
-#define HID_SD_NAVIGATOR_TBI_PEN    (HID_SD_START + 33)
-#define HID_SD_NAVIGATOR_TBI_FIRST  (HID_SD_START + 34)
-#define HID_SD_NAVIGATOR_TBI_PREV   (HID_SD_START + 35)
-#define HID_SD_NAVIGATOR_TBI_NEXT   (HID_SD_START + 36)
-#define HID_SD_NAVIGATOR_TBI_LAST   (HID_SD_START + 37)
-#define HID_SD_NAVIGATOR_TBI_DRAGTYPE   (HID_SD_START + 38)
-#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER (HID_SD_START + 39)
+#include <sfx2/sfxcommands.h>
+#include <svx/svxcommands.h>
+#include "sdcommands.h"
+
+#define HID_SDDRAWVIEWSHELL                                     "SD_HID_SDDRAWVIEWSHELL"
+#define HID_SDGRAPHICVIEWSHELL                                  "SD_HID_SDGRAPHICVIEWSHELL"
+#define HID_SDOUTLINEVIEWSHELL                                  "SD_HID_SDOUTLINEVIEWSHELL"
+#define HID_SD_PRINT_OPTIONS                                    "SD_HID_SD_PRINT_OPTIONS"
+#define HID_SD_OPTIONS_SNAP                                     "SD_HID_SD_OPTIONS_SNAP"
+#define HID_SD_OPTIONS_VIEW                                     "SD_HID_SD_OPTIONS_VIEW"
+#define HID_SD_AUTOPILOT_PAGE1                                  "SD_HID_SD_AUTOPILOT_PAGE1"
+#define HID_SD_AUTOPILOT_PAGE2                                  "SD_HID_SD_AUTOPILOT_PAGE2"
+#define HID_SD_AUTOPILOT_PAGE3                                  "SD_HID_SD_AUTOPILOT_PAGE3"
+#define HID_SD_AUTOPILOT_PAGE4                                  "SD_HID_SD_AUTOPILOT_PAGE4"
+#define HID_SD_AUTOPILOT_PAGE5                                  "SD_HID_SD_AUTOPILOT_PAGE5"
+#define HID_SD_AUTOPILOT_PAGE6                                  "SD_HID_SD_AUTOPILOT_PAGE6"
+#define HID_SD_CBX_ONLYSELECTED                                 "SD_HID_SD_CBX_ONLYSELECTED"
+#define HID_SD_BTN_FILTERDIALOG                                 "SD_HID_SD_BTN_FILTERDIALOG"
+#define HID_SD_BTN_PAGE                                         "SD_HID_SD_BTN_PAGE"
+#define HID_SD_BTN_MASTERPAGE                                   "SD_HID_SD_BTN_MASTERPAGE"
+#define HID_SD_BTN_LAYER                                        "SD_HID_SD_BTN_LAYER"
+#define HID_SD_BTN_DRAW                                         "SD_HID_SD_BTN_DRAW"
+#define HID_SD_BTN_SLIDE                                        "SD_HID_SD_BTN_SLIDE"
+#define HID_SD_BTN_OUTLINE                                      "SD_HID_SD_BTN_OUTLINE"
+#define HID_SD_BTN_NOTES                                        "SD_HID_SD_BTN_NOTES"
+#define HID_SD_BTN_HANDOUT                                      "SD_HID_SD_BTN_HANDOUT"
+#define HID_SD_WIN_DOCUMENT                                     "SD_HID_SD_WIN_DOCUMENT"
+#define HID_SD_OPTIONS_LAYOUT                                   "SD_HID_SD_OPTIONS_LAYOUT"
+#define HID_SD_OPTIONS_CONTENTS                                 "SD_HID_SD_OPTIONS_CONTENTS"
+#define HID_SD_OPTIONS_MISC                                     "SD_HID_SD_OPTIONS_MISC"
+#define HID_SD_EFFECT_PREVIEW                                   "SD_HID_SD_EFFECT_PREVIEW"
+#define HID_SD_CTL_NEWFOIL                                      "SD_HID_SD_CTL_NEWFOIL"
+#define HID_SD_NAVIGATOR_TLB                                    "SD_HID_SD_NAVIGATOR_TLB"
+#define HID_SD_NAVIGATOR                                        "SD_HID_SD_NAVIGATOR"
+#define HID_SD_CTL_EFFECTS                                      "SD_HID_SD_CTL_EFFECTS"
+#define HID_SD_CTL_TEXT_EFFECTS                                 "SD_HID_SD_CTL_TEXT_EFFECTS"
+#define HID_SD_CTL_SLIDE_CHANGE                                 "SD_HID_SD_CTL_SLIDE_CHANGE"
+#define HID_SD_NAVIGATOR_TBX                                    "SD_HID_SD_NAVIGATOR_TBX"
+#define HID_SD_NAVIGATOR_LB                                     "SD_HID_SD_NAVIGATOR_LB"
+#define HID_SD_NAVIGATOR_TBI_PEN                                "SD_HID_SD_NAVIGATOR_TBI_PEN"
+#define HID_SD_NAVIGATOR_TBI_FIRST                              "SD_HID_SD_NAVIGATOR_TBI_FIRST"
+#define HID_SD_NAVIGATOR_TBI_PREV                               "SD_HID_SD_NAVIGATOR_TBI_PREV"
+#define HID_SD_NAVIGATOR_TBI_NEXT                               "SD_HID_SD_NAVIGATOR_TBI_NEXT"
+#define HID_SD_NAVIGATOR_TBI_LAST                               "SD_HID_SD_NAVIGATOR_TBI_LAST"
+#define HID_SD_NAVIGATOR_TBI_DRAGTYPE                           "SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE"
+#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER                       "SD_HID_SD_NAVIGATOR_TBI_SHAPE_FILTER"
 
 // Toolboxen
-#define HID_SD_DRAW_DEFAULTTOOLBOX      (HID_SD_START + 40)
-#define HID_SD_PLUGINTOOLBOX            (HID_SD_START + 41)
-#define HID_SD_DRAW_TOOLBOX             (HID_SD_START + 42)
-#define HID_SD_SLIDE_TOOLBOX            (HID_SD_START + 43)
-#define HID_SD_OUTLINE_TOOLBOX          (HID_SD_START + 44)
-#define HID_SD_DRAW_OBJ_TOOLBOX         (HID_SD_START + 45)
-#define HID_SD_DRAW_OPTIONS_TOOLBOX     (HID_SD_START + 46)
-#define HID_SD_DRAW_COMMONTASK_TOOLBOX  (HID_SD_START + 47)
-#define HID_SD_BEZIER_TOOLBOX           (HID_SD_START + 48)
-#define HID_SD_TEXT_TOOLBOX             (HID_SD_START + 49)
-#define HID_SD_GLUEPOINTS_TOOLBOX       (HID_SD_START + 50)
-#define HID_SD_SLIDE_OBJ_TOOLBOX        (HID_SD_START + 51)
+#define HID_SD_DRAW_DEFAULTTOOLBOX                              "SD_HID_SD_DRAW_DEFAULTTOOLBOX"
+#define HID_SD_PLUGINTOOLBOX                                    "SD_HID_SD_PLUGINTOOLBOX"
+#define HID_SD_DRAW_TOOLBOX                                     "SD_HID_SD_DRAW_TOOLBOX"
+#define HID_SD_SLIDE_TOOLBOX                                    "SD_HID_SD_SLIDE_TOOLBOX"
+#define HID_SD_OUTLINE_TOOLBOX                                  "SD_HID_SD_OUTLINE_TOOLBOX"
+#define HID_SD_DRAW_OBJ_TOOLBOX                                 "SD_HID_SD_DRAW_OBJ_TOOLBOX"
+#define HID_SD_DRAW_OPTIONS_TOOLBOX                             "SD_HID_SD_DRAW_OPTIONS_TOOLBOX"
+#define HID_SD_DRAW_COMMONTASK_TOOLBOX                          "SD_HID_SD_DRAW_COMMONTASK_TOOLBOX"
+#define HID_SD_BEZIER_TOOLBOX                                   "SD_HID_SD_BEZIER_TOOLBOX"
+#define HID_SD_TEXT_TOOLBOX                                     "SD_HID_SD_TEXT_TOOLBOX"
+#define HID_SD_GLUEPOINTS_TOOLBOX                               "SD_HID_SD_GLUEPOINTS_TOOLBOX"
+#define HID_SD_SLIDE_OBJ_TOOLBOX                                "SD_HID_SD_SLIDE_OBJ_TOOLBOX"
 
 // FloatingWindows
-#define HID_SD_FW_ALIGNMENT             (HID_SD_START + 52)
-#define HID_SD_FW_ZOOM                  (HID_SD_START + 53)
-#define HID_SD_FW_CHOOSE_MODE           (HID_SD_START + 54)
-#define HID_SD_FW_TEXT                  (HID_SD_START + 55)
-#define HID_SD_FW_RECTANGLES            (HID_SD_START + 56)
-#define HID_SD_FW_ELLIPSES              (HID_SD_START + 57)
-#define HID_SD_FW_LINES                 (HID_SD_START + 58)
-#define HID_SD_FW_ARROWS                (HID_SD_START + 59)
-#define HID_SD_FW_3D_OBJECTS            (HID_SD_START + 60)
-#define HID_SD_FW_CONNECTORS            (HID_SD_START + 61)
-#define HID_SD_FW_INSERT                (HID_SD_START + 62)
-#define HID_SD_FW_POSITION              (HID_SD_START + 63)
-
-#define HID_SD_BTN_PREVIEW              (HID_SD_START + 64)
-
-#define HID_SD_NAVIGATOR_MENU1          (HID_SD_START + 65)
-#define HID_SD_NAVIGATOR_MENU2          (HID_SD_START + 66)
-#define HID_SD_NAVIGATOR_MENU3          (HID_SD_START + 67)
-
-#define HID_SD_WIN_PRESENTATION         (HID_SD_START + 68)
-
-// HelpIDs fuer Vorlagen
-#define HID_STANDARD_STYLESHEET_NAME        (HID_SD_START + 70)
-#define HID_POOLSHEET_OBJWITHARROW          (HID_SD_START + 71)
-#define HID_POOLSHEET_OBJWITHSHADOW         (HID_SD_START + 72)
-#define HID_POOLSHEET_OBJWITHOUTFILL        (HID_SD_START + 73)
-#define HID_POOLSHEET_TEXT                  (HID_SD_START + 74)
-#define HID_POOLSHEET_TEXTBODY              (HID_SD_START + 75)
-#define HID_POOLSHEET_TEXTBODY_JUSTIFY      (HID_SD_START + 76)
-#define HID_POOLSHEET_TEXTBODY_INDENT       (HID_SD_START + 77)
-#define HID_POOLSHEET_TITLE                 (HID_SD_START + 78)
-#define HID_POOLSHEET_TITLE1                (HID_SD_START + 79)
-#define HID_POOLSHEET_TITLE2                (HID_SD_START + 80)
-#define HID_POOLSHEET_HEADLINE              (HID_SD_START + 81)
-#define HID_POOLSHEET_HEADLINE1             (HID_SD_START + 82)
-#define HID_POOLSHEET_HEADLINE2             (HID_SD_START + 83)
-#define HID_POOLSHEET_MEASURE               (HID_SD_START + 84)
-
-#define HID_PSEUDOSHEET_TITLE               (HID_SD_START + 85)
-#define HID_PSEUDOSHEET_OUTLINE             (HID_SD_START + 86)
-#define HID_PSEUDOSHEET_OUTLINE1            (HID_SD_START + 87)
-#define HID_PSEUDOSHEET_OUTLINE2            (HID_SD_START + 88)
-#define HID_PSEUDOSHEET_OUTLINE3            (HID_SD_START + 89)
-#define HID_PSEUDOSHEET_OUTLINE4            (HID_SD_START + 90)
-#define HID_PSEUDOSHEET_OUTLINE5            (HID_SD_START + 91)
-#define HID_PSEUDOSHEET_OUTLINE6            (HID_SD_START + 92)
-#define HID_PSEUDOSHEET_OUTLINE7            (HID_SD_START + 93)
-#define HID_PSEUDOSHEET_OUTLINE8            (HID_SD_START + 94)
-#define HID_PSEUDOSHEET_OUTLINE9            (HID_SD_START + 95)
-#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS   (HID_SD_START + 96)
-#define HID_PSEUDOSHEET_BACKGROUND          (HID_SD_START + 97)
-#define HID_PSEUDOSHEET_NOTES               (HID_SD_START + 98)
-
-#define HID_DLG_DEFINE_CUSTOMSHOW           (HID_SD_START + 99)
-#define HID_DLG_DEFINE_CUSTOMSHOW_CTL       (HID_SD_START + 100)
-
-#define HID_PSEUDOSHEET_SUBTITLE            (HID_SD_START + 101)
-
-#define HID_CTL_ACTION_DLG_1                (HID_SD_START + 102)
-#define HID_CTL_ACTION_DLG_2                (HID_SD_START + 103)
-
-#define HID_SD_BTN_PRESENTATION             (HID_SD_START + 104)
-
-#define HID_SD_HTMLEXPORT_PAGE1             (HID_SD_START + 105)
-#define HID_SD_HTMLEXPORT_PAGE2             (HID_SD_START + 106)
-#define HID_SD_HTMLEXPORT_PAGE3             (HID_SD_START + 107)
-#define HID_SD_HTMLEXPORT_PAGE4             (HID_SD_START + 108)
-#define HID_SD_HTMLEXPORT_PAGE5             (HID_SD_START + 109)
-#define HID_SD_HTMLEXPORT_PAGE6             (HID_SD_START + 110)
-
-#define HID_SD_CHGFOIL_LAYOUT               (HID_SD_START + 111)
-#define HID_SD_CHGFOIL_BACKGROUND           (HID_SD_START + 112)
-#define HID_SD_CHGFOIL_OBJECTS              (HID_SD_START + 113)
-#define HID_SD_CHGFOIL_NAME                 (HID_SD_START + 114)
-
-#define HID_SD_HTMLEXPORT_DLG_DNAME         (HID_SD_START + 115)
-
-#define HID_FM_CTL_SELECTION                (HID_SD_START + 116)
-
-#define HID_SD_AUTOPILOT_REGION             (HID_SD_START + 117)
-#define HID_SD_AUTOPILOT_TEMPLATES          (HID_SD_START + 118)
-#define HID_SD_AUTOPILOT_OPEN               (HID_SD_START + 119)
-#define HID_SD_AUTOPILOT_PAGETEMPLATES      (HID_SD_START + 120)
-
-#define HID_SD_DRAW_GRAF_TOOLBOX            (HID_SD_START + 121)
-
-#define HID_SD_FW_GRAFFILTERS               (HID_SD_START + 122)
-
-#define HID_SD_TABBAR_PAGES                 (HID_SD_START + 123)
-#define HID_SD_TABBAR_LAYERS                (HID_SD_START + 124)
-
-#define HID_SD_UNDODELETEWARNING_DLG        (HID_SD_START + 125)
-#define HID_SD_UNDODELETEWARNING_CBX        (HID_SD_START + 126)
-
-#define HID_SD_PAGEOBJSTLB                  (HID_SD_START + 127)
-
-#define HID_SD_NAMEDIALOG_OBJECT            (HID_SD_START + 128)
-#define HID_SD_NAMEDIALOG_PAGE              (HID_SD_START + 129)
-#define HID_SD_NAMEDIALOG_LINEEND           (HID_SD_START + 130)
-
-#define HID_SD_DRAW_3D_TOOLBOX              (HID_SD_START + 131)
-#define HID_SD_DRAW_FONTWORK_TOOLBOX        (HID_SD_START + 132)
-
-#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE           (HID_SD_START + 133)
-#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT    (HID_SD_START + 134)
-
-#define HID_SD_DRAW_MEDIA_TOOLBOX           (HID_SD_START + 135)
-
-#define HID_SD_TASK_PANE                    (HID_SD_START + 136)
-#define HID_SD_SLIDE_DESIGNS                (HID_SD_START + 137)
-#define HID_SD_CURRENT_MASTERS              (HID_SD_START + 138)
-#define HID_SD_RECENT_MASTERS               (HID_SD_START + 139)
-#define HID_SD_ALL_MASTERS                  (HID_SD_START + 140)
-#define HID_SD_SLIDE_LAYOUTS                (HID_SD_START + 141)
-#define HID_SD_CUSTOM_ANIMATIONS            (HID_SD_START + 142)
-#define HID_SD_SLIDE_TRANSITIONS            (HID_SD_START + 143)
-
-#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT    (HID_SD_START + 144)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT (HID_SD_START + 145)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT (HID_SD_START + 146)
-#define HID_SD_CUSTOMANIMATIONPANE_LB_START         (HID_SD_START + 147)
-#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY      (HID_SD_START + 148)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE (HID_SD_START + 149)
-#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED         (HID_SD_START + 150)
-#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST (HID_SD_START + 151)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP       (HID_SD_START + 152)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN     (HID_SD_START + 153)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY          (HID_SD_START + 154)
-#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW    (HID_SD_START + 155)
-#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW   (HID_SD_START + 156)
-
-#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES    (HID_SD_START + 157)
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL         (HID_SD_START + 158)
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY                 (HID_SD_START + 159)
-#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW           (HID_SD_START + 160)
-#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW         (HID_SD_START + 161)
-
-#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS (HID_SD_START + 162)
-#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED             (HID_SD_START + 163)
-#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND             (HID_SD_START + 164)
-#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND        (HID_SD_START + 165)
-#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE  (HID_SD_START + 166)
-#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO      (HID_SD_START + 167)
-#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER (HID_SD_START + 168)
-#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL      (HID_SD_START + 169)
-#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY              (HID_SD_START + 170)
-#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW        (HID_SD_START + 171)
-#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW      (HID_SD_START + 172)
-
-#define HID_SD_TASK_PANE_VIEW_MENU          (HID_SD_START + 173)
-#define HID_SD_TASK_PANE_PREVIEW_CURRENT    (HID_SD_START + 174)
-#define HID_SD_TASK_PANE_PREVIEW_RECENT     (HID_SD_START + 175)
-#define HID_SD_TASK_PANE_PREVIEW_ALL        (HID_SD_START + 176)
-#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS    (HID_SD_START + 177)
-
-#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE           (HID_SD_START + 178)
-#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS           (HID_SD_START + 179)
-#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT               (HID_SD_START + 180)
-#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH         (HID_SD_START + 181)
-#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS        (HID_SD_START + 182)
-
-#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX        (HID_SD_START + 183)
-#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX         (HID_SD_START + 184)
-#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX          (HID_SD_START + 185)
-#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX    (HID_SD_START + 186)
-#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX      (HID_SD_START + 187)
-#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX  (HID_SD_START + 188)
-#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX         (HID_SD_START + 189)
-#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX     (HID_SD_START + 190)
-
-#define HID_SD_SLIDESHOW_DISPLAY                            (HID_SD_START + 191)
-
-#define HID_SD_RULER_HORIZONTAL                             (HID_SD_START + 192)
-#define HID_SD_RULER_VERTICAL                               (HID_SD_START + 193)
-
-#define HID_SD_CELL_STYLE_DEFAULT                           (HID_SD_START + 194)
-#define HID_SD_CELL_STYLE_BANDED                            (HID_SD_START + 195)
-#define HID_SD_CELL_STYLE_HEADER                            (HID_SD_START + 196)
-#define HID_SD_CELL_STYLE_TOTAL                             (HID_SD_START + 197)
-#define HID_SD_CELL_STYLE_FIRST_COLUMN                      (HID_SD_START + 198)
-#define HID_SD_CELL_STYLE_LAST_COLUMN                       (HID_SD_START + 199)
-
-#define HID_SD_TABLE_DESIGN                                 (HID_SD_START + 200)
-#define HID_SD_ANNOTATIONS                                  (HID_SD_START + 201)
-
+#define HID_SD_FW_ALIGNMENT                                     "SD_HID_SD_FW_ALIGNMENT"
+#define HID_SD_FW_ZOOM                                          "SD_HID_SD_FW_ZOOM"
+#define HID_SD_FW_CHOOSE_MODE                                   "SD_HID_SD_FW_CHOOSE_MODE"
+#define HID_SD_FW_TEXT                                          "SD_HID_SD_FW_TEXT"
+#define HID_SD_FW_RECTANGLES                                    "SD_HID_SD_FW_RECTANGLES"
+#define HID_SD_FW_ELLIPSES                                      "SD_HID_SD_FW_ELLIPSES"
+#define HID_SD_FW_LINES                                         "SD_HID_SD_FW_LINES"
+#define HID_SD_FW_ARROWS                                        "SD_HID_SD_FW_ARROWS"
+#define HID_SD_FW_3D_OBJECTS                                    "SD_HID_SD_FW_3D_OBJECTS"
+#define HID_SD_FW_CONNECTORS                                    "SD_HID_SD_FW_CONNECTORS"
+#define HID_SD_FW_INSERT                                        "SD_HID_SD_FW_INSERT"
+#define HID_SD_FW_POSITION                                      "SD_HID_SD_FW_POSITION"
+
+#define HID_SD_BTN_PREVIEW                                      "SD_HID_SD_BTN_PREVIEW"
+
+#define HID_SD_NAVIGATOR_MENU1                                  "SD_HID_SD_NAVIGATOR_MENU1"
+#define HID_SD_NAVIGATOR_MENU2                                  "SD_HID_SD_NAVIGATOR_MENU2"
+#define HID_SD_NAVIGATOR_MENU3                                  "SD_HID_SD_NAVIGATOR_MENU3"
+
+#define HID_SD_WIN_PRESENTATION                                 "SD_HID_SD_WIN_PRESENTATION"
+
+#define HID_DLG_DEFINE_CUSTOMSHOW                               "SD_HID_DLG_DEFINE_CUSTOMSHOW"
+#define HID_DLG_DEFINE_CUSTOMSHOW_CTL                           "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL"
+
+#define HID_CTL_ACTION_DLG_1                                    "SD_HID_CTL_ACTION_DLG_1"
+#define HID_CTL_ACTION_DLG_2                                    "SD_HID_CTL_ACTION_DLG_2"
+
+#define HID_SD_BTN_PRESENTATION                                 "SD_HID_SD_BTN_PRESENTATION"
+
+#define HID_SD_HTMLEXPORT_PAGE1                                 "SD_HID_SD_HTMLEXPORT_PAGE1"
+#define HID_SD_HTMLEXPORT_PAGE2                                 "SD_HID_SD_HTMLEXPORT_PAGE2"
+#define HID_SD_HTMLEXPORT_PAGE3                                 "SD_HID_SD_HTMLEXPORT_PAGE3"
+#define HID_SD_HTMLEXPORT_PAGE4                                 "SD_HID_SD_HTMLEXPORT_PAGE4"
+#define HID_SD_HTMLEXPORT_PAGE5                                 "SD_HID_SD_HTMLEXPORT_PAGE5"
+#define HID_SD_HTMLEXPORT_PAGE6                                 "SD_HID_SD_HTMLEXPORT_PAGE6"
+
+#define HID_SD_CHGFOIL_LAYOUT                                   "SD_HID_SD_CHGFOIL_LAYOUT"
+#define HID_SD_CHGFOIL_BACKGROUND                               "SD_HID_SD_CHGFOIL_BACKGROUND"
+#define HID_SD_CHGFOIL_OBJECTS                                  "SD_HID_SD_CHGFOIL_OBJECTS"
+#define HID_SD_CHGFOIL_NAME                                     "SD_HID_SD_CHGFOIL_NAME"
+
+#define HID_SD_HTMLEXPORT_DLG_DNAME                             "SD_HID_SD_HTMLEXPORT_DLG_DNAME"
+
+#define HID_FM_CTL_SELECTION                                    "SD_HID_FM_CTL_SELECTION"
+
+#define HID_SD_AUTOPILOT_REGION                                 "SD_HID_SD_AUTOPILOT_REGION"
+#define HID_SD_AUTOPILOT_TEMPLATES                              "SD_HID_SD_AUTOPILOT_TEMPLATES"
+#define HID_SD_AUTOPILOT_OPEN                                   "SD_HID_SD_AUTOPILOT_OPEN"
+#define HID_SD_AUTOPILOT_PAGETEMPLATES                          "SD_HID_SD_AUTOPILOT_PAGETEMPLATES"
+
+#define HID_SD_DRAW_GRAF_TOOLBOX                                "SD_HID_SD_DRAW_GRAF_TOOLBOX"
+
+#define HID_SD_FW_GRAFFILTERS                                   "SD_HID_SD_FW_GRAFFILTERS"
+
+#define HID_SD_TABBAR_PAGES                                     "SD_HID_SD_TABBAR_PAGES"
+#define HID_SD_TABBAR_LAYERS                                    "SD_HID_SD_TABBAR_LAYERS"
+
+#define HID_SD_UNDODELETEWARNING_DLG                            "SD_HID_SD_UNDODELETEWARNING_DLG"
+#define HID_SD_UNDODELETEWARNING_CBX                            "SD_HID_SD_UNDODELETEWARNING_CBX"
+
+#define HID_SD_PAGEOBJSTLB                                      "SD_HID_SD_PAGEOBJSTLB"
+
+#define HID_SD_NAMEDIALOG_OBJECT                                "SD_HID_SD_NAMEDIALOG_OBJECT"
+#define HID_SD_NAMEDIALOG_PAGE                                  "SD_HID_SD_NAMEDIALOG_PAGE"
+#define HID_SD_NAMEDIALOG_LINEEND                               "SD_HID_SD_NAMEDIALOG_LINEEND"
+
+#define HID_SD_DRAW_3D_TOOLBOX                                  "SD_HID_SD_DRAW_3D_TOOLBOX"
+#define HID_SD_DRAW_FONTWORK_TOOLBOX                            "SD_HID_SD_DRAW_FONTWORK_TOOLBOX"
+
+#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE                       "SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE"
+#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT                "SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT"
+
+#define HID_SD_DRAW_MEDIA_TOOLBOX                               "SD_HID_SD_DRAW_MEDIA_TOOLBOX"
+
+#define HID_SD_TASK_PANE                                        "SD_HID_SD_TASK_PANE"
+#define HID_SD_SLIDE_DESIGNS                                    "SD_HID_SD_SLIDE_DESIGNS"
+#define HID_SD_CURRENT_MASTERS                                  "SD_HID_SD_CURRENT_MASTERS"
+#define HID_SD_RECENT_MASTERS                                   "SD_HID_SD_RECENT_MASTERS"
+#define HID_SD_ALL_MASTERS                                      "SD_HID_SD_ALL_MASTERS"
+#define HID_SD_SLIDE_LAYOUTS                                    "SD_HID_SD_SLIDE_LAYOUTS"
+#define HID_SD_CUSTOM_ANIMATIONS                                "SD_HID_SD_CUSTOM_ANIMATIONS"
+#define HID_SD_SLIDE_TRANSITIONS                                "SD_HID_SD_SLIDE_TRANSITIONS"
+
+#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT                "SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT             "SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT             "SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT"
+#define HID_SD_CUSTOMANIMATIONPANE_LB_START                     "SD_HID_SD_CUSTOMANIMATIONPANE_LB_START"
+#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY                  "SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE             "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE"
+#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED                     "SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED"
+#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST     "SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP                   "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN                 "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY                      "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY"
+#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW                "SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW"
+#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW               "SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW"
+
+#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES        "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES"
+#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL             "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL"
+#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY                     "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY"
+#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW               "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW"
+#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW             "SD_HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW"
+
+#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS         "SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS"
+#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED                     "SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED"
+#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND                     "SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND"
+#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND                "SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND"
+#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE          "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE"
+#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO              "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO"
+#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER        "SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER"
+#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL              "SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL"
+#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY                      "SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY"
+#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW                "SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW"
+#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW              "SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW"
+
+#define HID_SD_TASK_PANE_VIEW_MENU                              "SD_HID_SD_TASK_PANE_VIEW_MENU"
+#define HID_SD_TASK_PANE_PREVIEW_CURRENT                        "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT"
+#define HID_SD_TASK_PANE_PREVIEW_RECENT                         "SD_HID_SD_TASK_PANE_PREVIEW_RECENT"
+#define HID_SD_TASK_PANE_PREVIEW_ALL                            "SD_HID_SD_TASK_PANE_PREVIEW_ALL"
+#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS                        "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS"
+
+#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE                   "SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE"
+#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS                   "SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS"
+#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT                       "SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT"
+#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH                 "SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH"
+#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS                "SD_HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS"
+
+#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX            "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX             "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX              "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX        "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX          "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX      "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX             "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX"
+#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX         "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX"
+
+#define HID_SD_SLIDESHOW_DISPLAY                                "SD_HID_SD_SLIDESHOW_DISPLAY"
+
+#define HID_SD_RULER_HORIZONTAL                                 "SD_HID_SD_RULER_HORIZONTAL"
+#define HID_SD_RULER_VERTICAL                                   "SD_HID_SD_RULER_VERTICAL"
+
+#define HID_SD_TABLE_DESIGN                                     "SD_HID_SD_TABLE_DESIGN"
+#define HID_SD_ANNOTATIONS                                      "SD_HID_SD_ANNOTATIONS"
+
+#define HID_DLG_INSERT_PAGES_OBJS                               "SD_HID_DLG_INSERT_PAGES_OBJS"
+#define HID_TABPAGE_PARA_NUMBERING                              "SD_HID_TABPAGE_PARA_NUMBERING"
+#define HID_VECTORIZE_DLG                                       "SD_HID_VECTORIZE_DLG"
+#define HID_UNDO_DELETE_WARNING                                 "SD_HID_UNDO_DELETE_WARNING"
+
+#define HID_MN_SUB_GROUP                                        "SD_HID_MN_SUB_GROUP"
+#define HID_MN_SUB_GRAPHIC                                      "SD_HID_MN_SUB_GRAPHIC"
+#define HID_MN_SUB_SEND                                         "SD_HID_MN_SUB_SEND"
+#define HID_MN_SUB_MASTER_LAYOUTS                               "SD_HID_MN_SUB_MASTER_LAYOUTS"
+#define HID_MN_SUB_VIEW                                         "SD_HID_MN_SUB_VIEW"
+#define HID_MN_SUB_MASTERPAGE                                   "SD_HID_MN_SUB_MASTERPAGE"
+#define HID_MN_SUB_FIELD                                        "SD_HID_MN_SUB_FIELD"
+#define HID_MN_SUB_TEMPLATES                                    "SD_HID_MN_SUB_TEMPLATES"
+#define HID_MN_SUB_SPELLING                                     "SD_HID_MN_SUB_SPELLING"
+#define HID_MN_SUB_POSITION                                     "SD_HID_MN_SUB_POSITION"
+#define HID_MN_SUB_OUTPUT_QUALITY                               "SD_HID_MN_SUB_OUTPUT_QUALITY"
+#define HID_MN_SUB_PREVIEW_OUTPUT_QUALITY                       "SD_HID_MN_SUB_PREVIEW_OUTPUT_QUALITY"
+#define HID_MN_SUB_CONVERT                                      "SD_HID_MN_SUB_CONVERT"
+#define HID_MN_SUB_MIRROR                                       "SD_HID_MN_SUB_MIRROR"
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 7e92020eb88f..2a4cec779f64 100644..100755
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -530,7 +530,6 @@
 #include "unotools/pathoptions.hxx"
 #include "svl/poolitem.hxx"
 #include "svtools/prgsbar.hxx"
-#include "svtools/printdlg.hxx"
 #include "svl/ptitem.hxx"
 #include "svl/rectitem.hxx"
 #include "unotools/saveopt.hxx"
@@ -617,7 +616,6 @@
 #include "svx/galbrws.hxx"
 #include "svx/gallery.hxx"
 #include "svx/globl3d.hxx"
-#include "svx/globlac.hrc"
 #include "svx/globlmn.hrc"
 #include "svx/grafctrl.hxx"
 #include "svx/hlnkitem.hxx"
@@ -865,7 +863,7 @@
 #include "vcl/group.hxx"
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
-#include "vcl/imagebtn.hxx"
+#include "vcl/button.hxx"
 #include "vcl/jobset.hxx"
 #include "vcl/lineinfo.hxx"
 #include "vcl/lstbox.hxx"
@@ -902,7 +900,7 @@
 #include "vcl/virdev.hxx"
 #include "vcl/waitobj.hxx"
 #include "vcl/window.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vcl/wrkwin.hxx"
 
 #include "vos/diagnose.hxx"
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index e9ae8df1a192..1b47afea90ae 100644..100755
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -120,7 +120,7 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog  //add for SdInsertLay
 public:
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) = 0;
     //from class ::Window
-    virtual void    SetHelpId( ULONG nHelpId ) = 0;
+    virtual void    SetHelpId( const rtl::OString& rHelpId ) = 0;
 };
 
 class AbstractSdInsertPasteDlg : public VclAbstractDialog  //add for SdInsertPasteDlg
@@ -153,12 +153,6 @@ public:
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) = 0;
 };
 
-class AbstractSdPrintDlg : public VclAbstractDialog  //add for SdPrintDlg
-{
-public:
-    virtual USHORT  GetAttr() = 0;
-};
-
 class AbstractSdPresLayoutDlg : public VclAbstractDialog  //add for SdPresLayoutDlg
 {
 public:
@@ -206,7 +200,6 @@ public:
     virtual SfxAbstractTabDialog*       CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0;
     virtual SfxAbstractTabDialog*       CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0;
     virtual AbstractSdStartPresDlg*     CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, List& rPageNames, List* pCSList ) = 0;
-    virtual AbstractSdPrintDlg*         CreateSdPrintDlg( ::Window* pWindow ) = 0; //add for SdPrintDlg
     virtual SfxAbstractTabDialog*       CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0;
     virtual AbstractSdPresLayoutDlg*    CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::sd::ViewShell* pViewShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0;
     virtual SfxAbstractTabDialog*       CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0;
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
new file mode 100644
index 000000000000..d0c1c059cdbe
--- /dev/null
+++ b/sd/inc/sdcommands.h
@@ -0,0 +1,310 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SD_SDCOMMANDS_HRC
+#define SD_SDCOMMANDS_HRC
+
+#define CMD_SID_OBJECT_MIRROR                       ".uno:Mirror"
+#define CMD_SID_OBJECT_CHOOSE_MODE                  ".uno:AdvancedMode"
+#define CMD_SID_ANIMATION_EFFECTS                   ".uno:AnimationEffects"
+#define CMD_SID_ANIMATION_OBJECTS                   ".uno:AnimationObjects"
+#define CMD_SID_ANIMATOR_ADD                        ".uno:AnimatorAddObject"
+#define CMD_SID_ANIMATOR_CREATE                     ".uno:AnimatorCreateObject"
+#define CMD_SID_ANIMATOR_INIT                       ".uno:AnimatorInit"
+#define CMD_SID_ANIMATOR_STATE                      ".uno:AnimatorState"
+#define CMD_SID_DRAWTBX_ARROWS                      ".uno:ArrowsToolbox"
+#define CMD_SID_MOREBACK                            ".uno:Backward"
+#define CMD_SID_BEFORE_OBJ                          ".uno:BeforeObject"
+#define CMD_SID_BEHIND_OBJ                          ".uno:BehindObject"
+#define CMD_SID_BIG_HANDLES                         ".uno:BigHandles"
+#define CMD_SID_BREAK                               ".uno:Break"
+#define CMD_SID_CAPTUREPOINT                        ".uno:CapturePoint"
+#define CMD_SID_CHANGEBEZIER                        ".uno:ChangeBezier"
+#define CMD_SID_CHANGEPOLYGON                       ".uno:ChangePolygon"
+#define CMD_SID_CLICK_CHANGE_ROTATION               ".uno:ClickChangeRotation"
+#define CMD_SID_OBJECT_CLOSE                        ".uno:CloseObject"
+#define CMD_SID_COLORVIEW                           ".uno:ColorView"
+#define CMD_SID_COMBINE                             ".uno:Combine"
+#define CMD_SID_3D_CONE                             ".uno:Cone"
+#define CMD_SID_CONNECT                             ".uno:Connect"
+#define CMD_SID_TOOL_CONNECTOR                      ".uno:Connector"
+#define CMD_SID_CONNECTOR_ARROW_END                 ".uno:ConnectorArrowEnd"
+#define CMD_SID_CONNECTOR_ARROWS                    ".uno:ConnectorArrows"
+#define CMD_SID_CONNECTOR_ARROW_START               ".uno:ConnectorArrowStart"
+#define CMD_SID_CONNECTION_DLG                      ".uno:ConnectorAttributes"
+#define CMD_SID_CONNECTOR_CIRCLE_END                ".uno:ConnectorCircleEnd"
+#define CMD_SID_CONNECTOR_CIRCLES                   ".uno:ConnectorCircles"
+#define CMD_SID_CONNECTOR_CIRCLE_START              ".uno:ConnectorCircleStart"
+#define CMD_SID_CONNECTOR_CURVE                     ".uno:ConnectorCurve"
+#define CMD_SID_CONNECTOR_CURVE_ARROW_END           ".uno:ConnectorCurveArrowEnd"
+#define CMD_SID_CONNECTOR_CURVE_ARROWS              ".uno:ConnectorCurveArrows"
+#define CMD_SID_CONNECTOR_CURVE_ARROW_START         ".uno:ConnectorCurveArrowStart"
+#define CMD_SID_CONNECTOR_CURVE_CIRCLE_END          ".uno:ConnectorCurveCircleEnd"
+#define CMD_SID_CONNECTOR_CURVE_CIRCLES             ".uno:ConnectorCurveCircles"
+#define CMD_SID_CONNECTOR_CURVE_CIRCLE_START        ".uno:ConnectorCurveCircleStart"
+#define CMD_SID_CONNECTOR_LINE                      ".uno:ConnectorLine"
+#define CMD_SID_CONNECTOR_LINE_ARROW_END            ".uno:ConnectorLineArrowEnd"
+#define CMD_SID_CONNECTOR_LINE_ARROWS               ".uno:ConnectorLineArrows"
+#define CMD_SID_CONNECTOR_LINE_ARROW_START          ".uno:ConnectorLineArrowStart"
+#define CMD_SID_CONNECTOR_LINE_CIRCLE_END           ".uno:ConnectorLineCircleEnd"
+#define CMD_SID_CONNECTOR_LINE_CIRCLES              ".uno:ConnectorLineCircles"
+#define CMD_SID_CONNECTOR_LINE_CIRCLE_START         ".uno:ConnectorLineCircleStart"
+#define CMD_SID_CONNECTOR_LINES                     ".uno:ConnectorLines"
+#define CMD_SID_CONNECTOR_LINES_ARROW_END           ".uno:ConnectorLinesArrowEnd"
+#define CMD_SID_CONNECTOR_LINES_ARROWS              ".uno:ConnectorLinesArrows"
+#define CMD_SID_CONNECTOR_LINES_ARROW_START         ".uno:ConnectorLinesArrowStart"
+#define CMD_SID_CONNECTOR_LINES_CIRCLE_END          ".uno:ConnectorLinesCircleEnd"
+#define CMD_SID_CONNECTOR_LINES_CIRCLES             ".uno:ConnectorLinesCircles"
+#define CMD_SID_CONNECTOR_LINES_CIRCLE_START        ".uno:ConnectorLinesCircleStart"
+#define CMD_SID_DRAWTBX_CONNECTORS                  ".uno:ConnectorToolbox"
+#define CMD_SID_CONVERT_TO_CONTOUR                  ".uno:convert_to_contour"
+#define CMD_SID_CONVERT_TO_3D                       ".uno:ConvertInto3D"
+#define CMD_SID_CONVERT_TO_3D_LATHE                 ".uno:ConvertInto3DLathe"
+#define CMD_SID_CONVERT_TO_3D_LATHE_FAST            ".uno:ConvertInto3DLatheFast"
+#define CMD_SID_CONVERT_TO_BITMAP                   ".uno:ConvertIntoBitmap"
+#define CMD_SID_CONVERT_TO_METAFILE                 ".uno:ConvertIntoMetaFile"
+#define CMD_SID_CONVERT_TO_1BIT_MATRIX              ".uno:ConvertTo1BitMatrix"
+#define CMD_SID_CONVERT_TO_1BIT_THRESHOLD           ".uno:ConvertTo1BitThreshold"
+#define CMD_SID_CONVERT_TO_4BIT_COLORS              ".uno:ConvertTo4BitColors"
+#define CMD_SID_CONVERT_TO_4BIT_GRAYS               ".uno:ConvertTo4BitGrays"
+#define CMD_SID_CONVERT_TO_8BIT_COLORS              ".uno:ConvertTo8BitColors"
+#define CMD_SID_CONVERT_TO_8BIT_GRAYS               ".uno:ConvertTo8BitGrays"
+#define CMD_SID_CONVERT_TO_24BIT                    ".uno:ConvertToTrueColor"
+#define CMD_SID_COPYOBJECTS                         ".uno:CopyObjects"
+#define CMD_SID_OBJECT_CROOK_ROTATE                 ".uno:CrookRotate"
+#define CMD_SID_OBJECT_CROOK_SLANT                  ".uno:CrookSlant"
+#define CMD_SID_OBJECT_CROOK_STRETCH                ".uno:CrookStretch"
+#define CMD_SID_3D_CUBE                             ".uno:Cube"
+#define CMD_SID_CUSTOMSHOW_DLG                      ".uno:CustomShowDialog"
+#define CMD_SID_3D_CYLINDER                         ".uno:Cylinder"
+#define CMD_SID_3D_PYRAMID                          ".uno:Cyramid"
+#define CMD_SID_DELETE_LAYER                        ".uno:DeleteLayer"
+#define CMD_SID_DELETE_PAGE                         ".uno:DeletePage"
+#define CMD_SID_DELETE_SNAPITEM                     ".uno:DeleteSnapItem"
+#define CMD_SID_UNSELECT                            ".uno:DeSelect"
+#define CMD_SID_DIAMODE                             ".uno:DiaMode"
+#define CMD_SID_DISMANTLE                           ".uno:Dismantle"
+#define CMD_SID_DOUBLECLICK_TEXTEDIT                ".uno:DoubleClickTextEdit"
+#define CMD_SID_DRAWINGMODE                         ".uno:DrawingMode"
+#define CMD_SID_DUPLICATE_PAGE                      ".uno:DuplicatePage"
+#define CMD_SID_EDIT_HYPERLINK                      ".uno:EditHyperlink"
+#define CMD_SID_EDIT_OUTLINER                       ".uno:EditOutline"
+#define CMD_SID_CUSTOM_ANIMATION_PANEL              ".uno:CustomAnimation"
+#define CMD_SID_CUSTOM_ANIMATION_SCHEMES_PANEL      ".uno:CustomAnimationSchemes"
+#define CMD_SID_DRAWTBX_ELLIPSES                    ".uno:EllipseToolbox"
+#define CMD_SID_EXPAND_PAGE                         ".uno:ExpandPage"
+#define CMD_SID_SETFILLCOLOR                        ".uno:SetFillColor"
+#define CMD_SID_MOREFRONT                           ".uno:Forward"
+#define CMD_SID_GETBLUE                             ".uno:GetBlue"
+#define CMD_SID_GETFILLSTYLE                        ".uno:GetFillStyle"
+#define CMD_SID_GETGREEN                            ".uno:GetGreen"
+#define CMD_SID_GETLINESTYLE                        ".uno:GetLineStyle"
+#define CMD_SID_GETLINEWIDTH                        ".uno:GetLineWidth"
+#define CMD_SID_GETRED                              ".uno:GetRed"
+#define CMD_SID_GLUE_EDITMODE                       ".uno:GlueEditMode"
+#define CMD_SID_GLUE_ESCDIR                         ".uno:GlueEscapeDirection"
+#define CMD_SID_GLUE_ESCDIR_BOTTOM                  ".uno:GlueEscapeDirectionBottom"
+#define CMD_SID_GLUE_ESCDIR_LEFT                    ".uno:GlueEscapeDirectionLeft"
+#define CMD_SID_GLUE_ESCDIR_RIGHT                   ".uno:GlueEscapeDirectionRight"
+#define CMD_SID_GLUE_ESCDIR_TOP                     ".uno:GlueEscapeDirectionTop"
+#define CMD_SID_GLUE_HORZALIGN_CENTER               ".uno:GlueHorzAlignCenter"
+#define CMD_SID_GLUE_HORZALIGN_LEFT                 ".uno:GlueHorzAlignLeft"
+#define CMD_SID_GLUE_HORZALIGN_RIGHT                ".uno:GlueHorzAlignRight"
+#define CMD_SID_GLUE_INSERT_POINT                   ".uno:GlueInsertPoint"
+#define CMD_SID_GLUE_PERCENT                        ".uno:GluePercent"
+#define CMD_SID_GLUE_VERTALIGN_BOTTOM               ".uno:GlueVertAlignBottom"
+#define CMD_SID_GLUE_VERTALIGN_CENTER               ".uno:GlueVertAlignCenter"
+#define CMD_SID_GLUE_VERTALIGN_TOP                  ".uno:GlueVertAlignTop"
+#define CMD_SID_GRADIENT                            ".uno:Gradient"
+#define CMD_SID_SETGRADENDCOLOR                     ".uno:GradientEndColor"
+#define CMD_SID_SETGRADSTARTCOLOR                   ".uno:GradientStartColor"
+#define CMD_SID_GRAPHIC_EXPORT                      ".uno:GraphicExport"
+#define CMD_SID_GRID_FRONT                          ".uno:GridFront"
+#define CMD_SID_3D_HALF_SPHERE                      ".uno:HalfSphere"
+#define CMD_SID_HANDLES_DRAFT                       ".uno:HandlesDraft"
+#define CMD_SID_HANDOUT_MASTERPAGE                  ".uno:HandoutMasterPage"
+#define CMD_SID_HANDOUTMODE                         ".uno:HandoutMode"
+#define CMD_SID_HATCH                               ".uno:Hatch"
+#define CMD_SID_SETHATCHCOLOR                       ".uno:HatchColor"
+#define CMD_SID_HELPLINES_FRONT                     ".uno:HelplinesFront"
+#define CMD_SID_HELPLINES_USE                       ".uno:HelplinesUse"
+#define CMD_SID_HELPLINES_VISIBLE                   ".uno:HelplinesVisible"
+#define CMD_SID_HIDE_SLIDE                          ".uno:HideSlide"
+#define CMD_SID_SHOW_SLIDE                          ".uno:ShowSlide"
+#define CMD_SID_HYPHENATION                         ".uno:Hyphenation"
+#define CMD_SID_INSERTFILE                          ".uno:ImportFromFile"
+#define CMD_SID_INSERT_FLD_AUTHOR                   ".uno:InsertAuthorField"
+#define CMD_SID_INSERT_FLD_DATE_FIX                 ".uno:InsertDateFieldFix"
+#define CMD_SID_INSERT_FLD_DATE_VAR                 ".uno:InsertDateFieldVar"
+#define CMD_SID_INSERT_FLD_FILE                     ".uno:InsertFileField"
+#define CMD_SID_INSERTLAYER                         ".uno:InsertLayer"
+#define CMD_SID_INSERTPAGE                          ".uno:InsertPage"
+#define CMD_SID_INSERT_FLD_PAGE                     ".uno:InsertPageField"
+#define CMD_SID_INSERT_FLD_PAGES                    ".uno:InsertPagesField"
+#define CMD_SID_INSERTPAGE_QUICK                    ".uno:InsertPageQuick"
+#define CMD_SID_INSERT_FLD_TIME_FIX                 ".uno:InsertTimeFieldFix"
+#define CMD_SID_INSERT_FLD_TIME_VAR                 ".uno:InsertTimeFieldVar"
+#define CMD_SID_DRAWTBX_INSERT                      ".uno:InsertToolbox"
+#define CMD_SID_OBJECT_GRADIENT                     ".uno:InteractiveGradient"
+#define CMD_SID_OBJECT_TRANSPARENCE                 ".uno:InteractiveTransparence"
+#define CMD_SID_LAYERMODE                           ".uno:LayerMode"
+#define CMD_SID_STATUS_LAYOUT                       ".uno:LayoutStatus"
+#define CMD_SID_LEAVE_ALL_GROUPS                    ".uno:LeaveAllGroups"
+#define CMD_SID_LINE_ARROW_CIRCLE                   ".uno:LineArrowCircle"
+#define CMD_SID_LINE_ARROW_END                      ".uno:LineArrowEnd"
+#define CMD_SID_LINE_ARROWS                         ".uno:LineArrows"
+#define CMD_SID_LINE_ARROW_SQUARE                   ".uno:LineArrowSquare"
+#define CMD_SID_LINE_ARROW_START                    ".uno:LineArrowStart"
+#define CMD_SID_LINE_CIRCLE_ARROW                   ".uno:LineCircleArrow"
+#define CMD_SID_SETLINECOLOR                        ".uno:LineColor"
+#define CMD_SID_LINEEND_POLYGON                     ".uno:LineEndPolygon"
+#define CMD_SID_LINE_SQUARE_ARROW                   ".uno:LineSquareArrow"
+#define CMD_SID_LINETO                              ".uno:LineTo"
+#define CMD_SID_DRAWTBX_LINES                       ".uno:LineToolbox"
+#define CMD_SID_MANAGE_LINKS                        ".uno:ManageLinks"
+#define CMD_SID_MASTERPAGE                          ".uno:MasterPage"
+#define CMD_SID_MEASURE_DLG                         ".uno:MeasureAttributes"
+#define CMD_SID_DRAW_MEASURELINE                    ".uno:MeasureLine"
+#define CMD_SID_HORIZONTAL                          ".uno:MirrorHorz"
+#define CMD_SID_VERTICAL                            ".uno:MirrorVert"
+#define CMD_SID_MODIFY_FIELD                        ".uno:ModifyField"
+#define CMD_SID_MODIFYLAYER                         ".uno:ModifyLayer"
+#define CMD_SID_MODIFYPAGE                          ".uno:ModifyPage"
+#define CMD_SID_ASSIGN_LAYOUT                       ".uno:AssignLayout"
+#define CMD_SID_PRESENTATIONOBJECT                  ".uno:ModifyPresentationObject"
+#define CMD_SID_POLYGON_MORPHING                    ".uno:Morphing"
+#define CMD_SID_MOVETO                              ".uno:MoveTo"
+#define CMD_SID_NAME_GROUP                          ".uno:NameGroup"
+#define CMD_SID_OBJECT_TITLE_DESCRIPTION            ".uno:ObjectTitleDescription"
+#define CMD_SID_NAVIGATOR_INIT                      ".uno:NavigatorInit"
+#define CMD_SID_NAVIGATOR_OBJECT                    ".uno:NavigatorObject"
+#define CMD_SID_NAVIGATOR_PAGE                      ".uno:NavigatorPage"
+#define CMD_SID_NAVIGATOR_PAGENAME                  ".uno:NavigatorPageName"
+#define CMD_SID_NAVIGATOR_PEN                       ".uno:NavigatorPen"
+#define CMD_SID_NAVIGATOR_STATE                     ".uno:NavigatorState"
+#define CMD_SID_CONNECTION_NEW_ROUTING              ".uno:NewRouting"
+#define CMD_SID_NOTES_MASTERPAGE                    ".uno:NotesMasterPage"
+#define CMD_SID_NOTESMODE                           ".uno:NotesMode"
+#define CMD_SID_POSITION                            ".uno:ObjectPosition"
+#define CMD_SID_DRAWTBX_3D_OBJECTS                  ".uno:Objects3DToolbox"
+#define CMD_SID_ORIGINAL_SIZE                       ".uno:OriginalSize"
+#define CMD_SID_SAVEGRAPHIC                         ".uno:SaveGraphic"
+#define CMD_SID_OUTLINEMODE                         ".uno:OutlineMode"
+#define CMD_SID_OUTPUT_QUALITY_BLACKWHITE           ".uno:OutputQualityBlackWhite"
+#define CMD_SID_OUTPUT_QUALITY_COLOR                ".uno:OutputQualityColor"
+#define CMD_SID_OUTPUT_QUALITY_CONTRAST             ".uno:OutputQualityContrast"
+#define CMD_SID_OUTPUT_QUALITY_GRAYSCALE            ".uno:OutputQualityGrayscale"
+#define CMD_SID_PACKNGO                             ".uno:PackAndGo"
+#define CMD_SID_PAGEMARGIN                          ".uno:PageMargin"
+#define CMD_SID_PAGEMODE                            ".uno:PageMode"
+#define CMD_SID_PAGESETUP                           ".uno:PageSetup"
+#define CMD_SID_PAGESIZE                            ".uno:PageSize"
+#define CMD_SID_PAGES_PER_ROW                       ".uno:PagesPerRow"
+#define CMD_SID_STATUS_PAGE                         ".uno:PageStatus"
+#define CMD_SID_PARASPACE_DECREASE                  ".uno:ParaspaceDecrease"
+#define CMD_SID_PARASPACE_INCREASE                  ".uno:ParaspaceIncrease"
+#define CMD_SID_PICK_THROUGH                        ".uno:PickThrough"
+#define CMD_SID_DRAW_POLYGON                        ".uno:Polygon"
+#define CMD_SID_PRESENTATION                        ".uno:Presentation"
+#define CMD_SID_PRESENTATION_DLG                    ".uno:PresentationDialog"
+#define CMD_SID_PRESENTATION_END                    ".uno:PresentationEnd"
+#define CMD_SID_CLEAR_UNDO_STACK                    ".uno:ClearUndoStack"
+#define CMD_SID_PRESENTATION_LAYOUT                 ".uno:PresentationLayout"
+#define CMD_SID_PREVIEW_STATE                       ".uno:PreviewState"
+#define CMD_SID_PREVIEW_WIN                         ".uno:PreviewWindow"
+#define CMD_SID_QUICKEDIT                           ".uno:QuickEdit"
+#define CMD_SID_DRAWTBX_RECTANGLES                  ".uno:RectangleToolbox"
+#define CMD_SID_REHEARSE_TIMINGS                    ".uno:RehearseTimings"
+#define CMD_SID_RENAMELAYER                         ".uno:RenameLayer"
+#define CMD_SID_RENAMEPAGE                          ".uno:RenamePage"
+#define CMD_SID_RENAMEPAGE_QUICK                    ".uno:RenamePageQuick"
+#define CMD_SID_REVERSE_ORDER                       ".uno:ReverseOrder"
+#define CMD_SID_RULER_OBJECT                        ".uno:RulerObject"
+#define CMD_SID_SELECTAT                            ".uno:SelectAt"
+#define CMD_SID_SELECTGRADIENT                      ".uno:SelectGradient"
+#define CMD_SID_SELECTHATCH                         ".uno:SelectHatch"
+#define CMD_SID_SETFILLSTYLE                        ".uno:SetFillStyle"
+#define CMD_SID_SETLINESTYLE                        ".uno:SetLineStyle"
+#define CMD_SID_SETLINEWIDTH                        ".uno:SetLineWidth"
+#define CMD_SID_SET_SNAPITEM                        ".uno:SetSnapItem"
+#define CMD_SID_OBJECT_SHEAR                        ".uno:Shear"
+#define CMD_SID_3D_SHELL                            ".uno:Shell3D"
+#define CMD_SID_SLIDE_TRANSITIONS_PANEL             ".uno:SlideChangeWindow"
+#define CMD_SID_SLIDE_MASTERPAGE                    ".uno:SlideMasterPage"
+#define CMD_SID_SNAP_BORDER                         ".uno:SnapBorder"
+#define CMD_SID_SNAP_FRAME                          ".uno:SnapFrame"
+#define CMD_SID_SNAP_POINTS                         ".uno:SnapPoints"
+#define CMD_SID_SOLID_CREATE                        ".uno:SolidCreate"
+#define CMD_SID_3D_SPHERE                           ".uno:Sphere"
+#define CMD_SID_STARTAPP                            ".uno:StartApplication"
+#define CMD_SID_SUMMARY_PAGE                        ".uno:SummaryPage"
+#define CMD_SID_SWITCHLAYER                         ".uno:SwitchLayer"
+#define CMD_SID_SWITCHPAGE                          ".uno:SwitchPage"
+#define CMD_SID_SWITCH_POINTEDIT                    ".uno:SwitchPointEdit"
+#define CMD_SID_TEXTALIGNMENT                       ".uno:TextAlignment"
+#define CMD_SID_TEXTATTR_DLG                        ".uno:TextAttributes"
+#define CMD_SID_TEXT_FITTOSIZE                      ".uno:TextFitToSizeTool"
+#define CMD_SID_DRAWTBX_TEXT                        ".uno:TextToolbox"
+#define CMD_SID_TITLE_MASTERPAGE                    ".uno:TitleMasterPage"
+#define CMD_SID_3D_TORUS                            ".uno:Torus"
+#define CMD_SID_TEXT_FITTOSIZE_VERTICAL             ".uno:VerticalTextFitToSizeTool"
+#define CMD_SID_ZOOM_PANNING                        ".uno:ZoomPanning"
+#define CMD_SID_OBJECT_CROP                         ".uno:Crop"
+#define CMD_SID_HEADER_AND_FOOTER                   ".uno:HeaderAndFooter"
+#define CMD_SID_INSERT_PAGE_NUMBER                  ".uno:InsertPageNumber"
+#define CMD_SID_INSERT_DATE_TIME                    ".uno:InsertDateAndTime"
+#define CMD_SID_MASTER_LAYOUTS                      ".uno:MasterLayouts"
+#define CMD_SID_DRAW_FONTWORK                       ".uno:DrawFontwork"
+#define CMD_SID_DRAW_FONTWORK_VERTICAL              ".uno:DrawFontworkVertical"
+#define CMD_SID_LAYER_DIALOG_WIN                    ".uno:LayerDialogChildWindow"
+#define CMD_SID_INSERT_MASTER_PAGE                  ".uno:InsertMasterPage"
+#define CMD_SID_DELETE_MASTER_PAGE                  ".uno:DeleteMasterPage"
+#define CMD_SID_RENAME_MASTER_PAGE                  ".uno:RenameMasterPage"
+#define CMD_SID_CLOSE_MASTER_VIEW                   ".uno:CloseMasterView"
+#define CMD_SID_SELECT_BACKGROUND                   ".uno:SelectBackground"
+#define CMD_SID_DISPLAY_MASTER_BACKGROUND           ".uno:DisplayMasterBackground"
+#define CMD_SID_DISPLAY_MASTER_OBJECTS              ".uno:DisplayMasterObjects"
+#define CMD_SID_TABLE_TOOLBOX                       ".uno:TableToolBox"
+#define CMD_SID_TABLE_DISTRIBUTE_COLUMNS            ".uno:DistributeColumns"
+#define CMD_SID_TABLE_DISTRIBUTE_ROWS               ".uno:DistributeRows"
+#define CMD_SID_TP_APPLY_TO_ALL_SLIDES              ".uno:TaskPaneApplyToAllSlides"
+#define CMD_SID_TP_APPLY_TO_SELECTED_SLIDES         ".uno:TaskPaneApplyToSelectedSlides"
+#define CMD_SID_TP_USE_FOR_NEW_PRESENTATIONS        ".uno:TaskPaneUseForNewPresentations"
+#define CMD_SID_TP_SHOW_SMALL_PREVIEW               ".uno:TaskPaneShowSmallPreview"
+#define CMD_SID_TP_SHOW_LARGE_PREVIEW               ".uno:TaskPaneShowLargePreview"
+#define CMD_SID_TP_EDIT_MASTER                      ".uno:TaskPaneEditMaster"
+#define CMD_SID_INSERTPAGE_LAYOUT_MENU              ".uno:TaskPaneInsertPage"
+#define CMD_SID_SWITCH_SHELL                        ".uno:SwitchViewShell"
+#define CMD_SID_SWITCH_SHELL_PANE                   ".uno:SwitchViewShellPane"
+#define CMD_SID_LEFT_PANE_IMPRESS                   ".uno:LeftPaneImpress"
+#define CMD_SID_LEFT_PANE_DRAW                      ".uno:LeftPaneDraw"
+#define CMD_SID_RIGHT_PANE                          ".uno:RightPane"
+#define CMD_SID_NOTES_WINDOW                        ".uno:NotesChildWindow"
+#define CMD_SID_NORMAL_MULTI_PANE_GUI               ".uno:NormalMultiPaneGUI"
+#define CMD_SID_SLIDE_SORTER_MULTI_PANE_GUI         ".uno:SlideSorterMultiPaneGUI"
+#define CMD_SID_TASK_PANE                           ".uno:TaskPaneShowPanel"
+
+#endif
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index f0d5cc64a3c4..c323f9678d38 100755
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -114,8 +114,6 @@ public:
     void                    Execute(SfxRequest& rReq);
     void                    GetState(SfxItemSet&);
 
-    virtual void            FillStatusBar(StatusBar& rBar);
-
     SdOptions*              GetSdOptions(DocumentType eDocType);
     SD_DLLPUBLIC SvStorageStreamRef     GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode );
 
diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx
index 1b87a6a9e10f..4b6ffb21d496 100755
--- a/sd/inc/shapelist.hxx
+++ b/sd/inc/shapelist.hxx
@@ -47,8 +47,6 @@ namespace sd
             a pointer to the next shape in list or 0*/
         SdrObject* removeShape( SdrObject& rObject );
 
-        void replaceShape( SdrObject& rOldObject, SdrObject& rNewObject );
-
         /** removes all shapes from this list */
         void clear();