SD_TOOLBOX is never defined outside toolbox2_tmpl.src

Change-Id: Ie6d05762baae87794e9320a6b123ef326289e4c1

sd/source/ui/app/strings.src

@@ -24,10 +24,6 @@ String STR_DRAW_TOOLBOX
 {
     Text [ en-US ] = "Drawings Toolbar" ;
 };
-String STR_GRAPHIC_TOOLBOX
-{
-    Text [ en-US ] = "Draw Toolbar/Image" ;
-};
 String STR_SLIDE_TOOLBOX
 {
     Text [ en-US ] = "Slide Bar" ;
@@ -48,10 +44,6 @@ String STR_DRAW_OPTIONS_TOOLBOX
 {
     Text [ en-US ] = "Options Bar" ;
 };
-String STR_GRAPHIC_OPTIONS_TOOLBOX
-{
-    Text [ en-US ] = "Options Bar/Image" ;
-};
 String STR_DRAW_COMMONTASK_TOOLBOX
 {
     Text [ en-US ] = "Presentation" ;
@@ -72,10 +64,6 @@ String STR_DRAW_TEXT_TOOLBOX
 {
     Text [ en-US ] = "Text Object Bar" ;
 };
-String STR_GRAPHIC_TEXT_TOOLBOX
-{
-    Text [ en-US ] = "Text Object Bar/Draw" ;
-};
 String RID_APPTITLE
 {
     Text = "StarImpress 4.0" ;

sd/source/ui/app/tbxids_tmpl.src

@@ -42,16 +42,6 @@
         RadioCheck = TRUE ; \
     };
 
-#define TBI_OBJECT_CHOOSE_MODE \
-    ToolBoxItem\
-    {\
-        Identifier = SID_OBJECT_CHOOSE_MODE ; \
-        HelpID = SID_OBJECT_CHOOSE_MODE ; \
-        DropDown = TRUE ; \
-        Checkable = TRUE ; \
-        RadioCheck = TRUE ; \
-    };
-
 #define TBI_OBJECT_ALIGN \
     ToolBoxItem\
     {\

sd/source/ui/app/toolbox.src

@@ -26,11 +26,6 @@ String RID_DRAW_VIEWER_TOOLBOX
     Text [ en-US ] = "Function Bar (viewing mode)" ;
 };
 
-String RID_GRAPHIC_VIEWER_TOOLBOX
-{
-    Text [ en-US ] = "Function Bar (viewing mode)" ;
-};
-
 String RID_DRAW_MEDIA_TOOLBOX
 {
     Text [ en-US ] = "Media Playback" ;

sd/source/ui/app/toolbox2_tmpl.src

@@ -17,15 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SD_TOOLBOX
-#define SD_TOOLBOX RID_DRAW_TOOLBOX
 #include "tbxids_tmpl.src"
 #include <svx/svxids.hrc>
 #include <svx/globlmn.hrc>
-#endif
 
  // toolbox bar
-ToolBox SD_TOOLBOX
+ToolBox RID_DRAW_TOOLBOX
 {
     HelpId = HID_SD_DRAW_TOOLBOX ;
     LineSpacing = TRUE ;
@@ -64,17 +61,12 @@ ToolBox SD_TOOLBOX
         TBI_DRAWTBX_CS_CALLOUT
         TBI_DRAWTBX_CS_STAR
         SEPARATOR
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
-        TBI_OBJECT_CHOOSE_MODE
-#endif
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
         ToolBoxItem
         {
             ITEM_TOOLBAR_OBJECT_ROTATE
             Checkable = TRUE ;
             RadioCheck = TRUE ;
         };
-#endif
         TBI_OBJECT_ALIGN
         TBI_POSITION
         SEPARATOR
@@ -85,16 +77,12 @@ ToolBox SD_TOOLBOX
             Hide = TRUE;
         };
         SEPARATOR
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
         /* TBI_EFFECT_WIN */
         TBI_ANIMATION_EFFECTS
         TBI_ANIMATION_OBJECTS
-#endif
         TBI_3D_WIN
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
         SEPARATOR
         TBI_PRESENTATION
-#endif
         TBI_ZOOM_IN
         TBI_ZOOM_OUT
         TBI_ATTR_TRANSFORM
@@ -128,11 +116,7 @@ ToolBox SD_TOOLBOX
 };
 
  // object bar
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
 ToolBox RID_DRAW_OBJ_TOOLBOX
-#elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX
-ToolBox RID_GRAPHIC_OBJ_TOOLBOX
-#endif
 {
     HelpId = HID_SD_DRAW_OBJ_TOOLBOX ;
     LineSpacing = TRUE ;
@@ -163,19 +147,13 @@ ToolBox RID_GRAPHIC_OBJ_TOOLBOX
         TBI ( ITEM_TOOLBAR_ATTR_FILL_STYLE )
         SEPARATOR
         TBI_ATTR_FILL_SHADOW
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
         TBI_TOGGLECOMMONTASKBAR
-#endif
         TBI_IMAGEMAP
     };
 };
 
 // option bar
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
 ToolBox RID_DRAW_OPTIONS_TOOLBOX
-#elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX
-ToolBox RID_GRAPHIC_OPTIONS_TOOLBOX
-#endif
 {
     HelpId = HID_SD_DRAW_OPTIONS_TOOLBOX ;
     LineSpacing = TRUE ;
@@ -213,18 +191,10 @@ ToolBox RID_GRAPHIC_OPTIONS_TOOLBOX
         TBI_PICK_THROUGH
         TBI_DOUBLECLICK_TEXTEDIT
         SEPARATOR
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
-        TBI_SOLID_CREATE
-#endif
-        SEPARATOR
         TBI_LEAVE_ALL_GROUPS
     };
 };
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
 ToolBox RID_DRAW_TEXT_TOOLBOX
-#elif SD_TOOLBOX == RID_GRAPHIC_TOOLBOX
-ToolBox RID_GRAPHIC_TEXT_TOOLBOX
-#endif
 {
     HelpId = HID_SD_TEXT_TOOLBOX ;
     LineSpacing = TRUE ;
@@ -338,29 +308,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
         {
             Type = TOOLBOXITEM_SEPARATOR ;
         };
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_10
-        };
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_15
-        };
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_20
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_ON ;
-            HelpID = FN_NUM_BULLET_ON ;
-        };
-#else
         ToolBoxItem
         {
             ITEM_FORMAT_PARA_LINESPACE_10
@@ -405,7 +352,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
             Identifier = SID_OUTLINE_DOWN ;
             HelpID = SID_OUTLINE_DOWN ;
         };
-#endif
         ToolBoxItem
         {
             Type = TOOLBOXITEM_SEPARATOR ;
@@ -436,13 +382,11 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
         {
             Type = TOOLBOXITEM_SEPARATOR ;
         };
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
         ToolBoxItem
         {
             Identifier = SID_OUTLINE_BULLET ;
             HelpID = SID_OUTLINE_BULLET ;
         };
-#endif
         ToolBoxItem
         {
             Identifier = SID_CHARMAP;
@@ -547,29 +491,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
         {
             Type = TOOLBOXITEM_SEPARATOR ;
         };
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_10
-        };
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_15
-        };
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_20
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_ON ;
-            HelpID = FN_NUM_BULLET_ON ;
-        };
-#else
         ToolBoxItem
         {
             ITEM_FORMAT_PARA_LINESPACE_10
@@ -614,7 +535,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
             Identifier = SID_OUTLINE_DOWN ;
             HelpID = SID_OUTLINE_DOWN ;
         };
-#endif
         ToolBoxItem
         {
             Type = TOOLBOXITEM_SEPARATOR ;
@@ -645,13 +565,11 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
         {
             Type = TOOLBOXITEM_SEPARATOR ;
         };
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
         ToolBoxItem
         {
             Identifier = SID_OUTLINE_BULLET ;
             HelpID = SID_OUTLINE_BULLET ;
         };
-#endif
         ToolBoxItem
         {
             Identifier = SID_CHARMAP;
@@ -756,29 +674,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
         {
             Type = TOOLBOXITEM_SEPARATOR ;
         };
-#if SD_TOOLBOX != RID_DRAW_TOOLBOX
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_10
-        };
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_15
-        };
-        ToolBoxItem
-        {
-            ITEM_FORMAT_PARA_LINESPACE_20
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_ON ;
-            HelpID = FN_NUM_BULLET_ON ;
-        };
-#else
         ToolBoxItem
         {
             ITEM_FORMAT_PARA_LINESPACE_10
@@ -823,7 +718,6 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
             Identifier = SID_OUTLINE_DOWN ;
             HelpID = SID_OUTLINE_DOWN ;
         };
-#endif
         ToolBoxItem
         {
             Type = TOOLBOXITEM_SEPARATOR ;
@@ -854,13 +748,11 @@ ToolBox RID_GRAPHIC_TEXT_TOOLBOX
         {
             Type = TOOLBOXITEM_SEPARATOR ;
         };
-#if SD_TOOLBOX == RID_DRAW_TOOLBOX
         ToolBoxItem
         {
             Identifier = SID_OUTLINE_BULLET ;
             HelpID = SID_OUTLINE_BULLET ;
         };
-#endif
         ToolBoxItem
         {
             Identifier = SID_CHARMAP;

sd/source/ui/inc/ToolBarManager.hxx

@@ -104,12 +104,9 @@ public:
     /** The set of tool bars that are handled by this manager class.
     */
     const static OUString msToolBar;                  // RID_DRAW_TOOLBOX, 23011
-                                                             // RID_GRAPHIC_TOOLBOX, 23025
     const static OUString msOptionsToolBar;           // RID_DRAW_OPTIONS_TOOLBOX, 23020
-                                                             // RID_GRAPHIC_OPTIONS_TOOLBOX, 23026
     const static OUString msCommonTaskToolBar;        // RID_DRAW_COMMONTASK_TOOLBOX, 23021
     const static OUString msViewerToolBar;            // RID_DRAW_VIEWER_TOOLBOX, 23023
-                                                             // RID_GRAPHIC_VIEWER_TOOLBOX, 23024
     const static OUString msSlideSorterToolBar;       // RID_SLIDE_TOOLBOX, 23012
     const static OUString msSlideSorterObjectBar;     // RID_SLIDE_OBJ_TOOLBOX, 23014
     const static OUString msOutlineToolBar;           // RID_OUTLINE_TOOLBOX, 23017
@@ -117,7 +114,6 @@ public:
     const static OUString msDrawingObjectToolBar;     // RID_DRAW_OBJ_TOOLBOX, 23013
     const static OUString msGluePointsToolBar;        // RID_GLUEPOINTS_TOOLBOX, 23019
     const static OUString msTextObjectBar;            // RID_DRAW_TEXT_TOOLBOX, 23016
-                                                             // RID_GRAPHIC_TEXT_TOOLBOX, 23028
     const static OUString msBezierObjectBar;          // RID_BEZIER_TOOLBOX, 23015
     const static OUString msGraphicObjectBar;         // RID_DRAW_GRAF_TOOLBOX, 23030
     const static OUString msMediaObjectBar;           // RID_DRAW_MEDIA_TOOLBOX, 23031

sd/source/ui/inc/cfgids.hxx

@@ -43,13 +43,7 @@
 #define RID_DRAW_COMMONTASK_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 21)
 #define RID_FORMLAYER_TOOLBOX       (SFX_ITEMTYPE_SD_BEGIN + 22)
 #define RID_DRAW_VIEWER_TOOLBOX     (SFX_ITEMTYPE_SD_BEGIN + 23)
-#define RID_GRAPHIC_VIEWER_TOOLBOX  (SFX_ITEMTYPE_SD_BEGIN + 24)
-
-#define RID_GRAPHIC_TOOLBOX         (SFX_ITEMTYPE_SD_BEGIN + 25)
-#define RID_GRAPHIC_OPTIONS_TOOLBOX (SFX_ITEMTYPE_SD_BEGIN + 26)
 #define RID_GRAPHIC_OBJ_TOOLBOX     (SFX_ITEMTYPE_SD_BEGIN + 27)
-#define RID_GRAPHIC_TEXT_TOOLBOX    (SFX_ITEMTYPE_SD_BEGIN + 28)
-
 #define RID_DRAW_GRAF_TOOLBOX       (SFX_ITEMTYPE_SD_BEGIN + 30)
 #define RID_DRAW_MEDIA_TOOLBOX      (SFX_ITEMTYPE_SD_BEGIN + 31)
 

sd/source/ui/inc/strings.hrc

@@ -126,10 +126,7 @@
 #define STR_DRAW_OPTIONS_TOOLBOX    RID_DRAW_OPTIONS_TOOLBOX
 #define STR_DRAW_COMMONTASK_TOOLBOX RID_DRAW_COMMONTASK_TOOLBOX
 
-#define STR_GRAPHIC_TOOLBOX         RID_GRAPHIC_TOOLBOX
-#define STR_GRAPHIC_OPTIONS_TOOLBOX RID_GRAPHIC_OPTIONS_TOOLBOX
 #define STR_GRAPHIC_OBJ_TOOLBOX     RID_GRAPHIC_OBJ_TOOLBOX
-#define STR_GRAPHIC_TEXT_TOOLBOX    RID_GRAPHIC_TEXT_TOOLBOX
 
 #define STR_DRAW_GRAF_TOOLBOX       RID_DRAW_GRAF_TOOLBOX