CWS changehid: #i111874#: change code to support HelpIds as byte strings

3 files changed, 7 insertions, 843 deletions

diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 7e9a20bb6fc0..8e6527206d77 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -156,880 +156,46 @@ String RID_TEXT_TOOLBOX
         Text [ en-US ] = "Text Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_TEXT_TOOLBOX
-{
-    HelpID = HID_TEXT_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    LineSpacing = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FONT
-        MN_TEXT1(TRUE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LTR_RTL
-        MN_TEXT_LINESPACE
-        MN_TEXT2
-        MN_TEXT_BACKGROUND
-        MN_TEXT_DIALOGS(TRUE)
-    };
-    Scroll = TRUE ;
-};
 String RID_TABLE_TOOLBOX
 {
         Text [ en-US ] = "Table Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_TABLE_TOOLBOX
-{
-    HelpID = HID_TABLE_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    Scroll = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FONT
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_AUTOSUM ;
-            HelpID = FN_TABLE_AUTOSUM ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MODE_FIX ;
-            HelpID = FN_TABLE_MODE_FIX ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MODE_FIX_PROP ;
-            HelpID = FN_TABLE_MODE_FIX_PROP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MODE_VARIABLE ;
-            HelpID = FN_TABLE_MODE_VARIABLE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_MERGE_CELLS ;
-            HelpID = FN_TABLE_MERGE_CELLS ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SPLIT_CELLS ;
-            HelpID = FN_TABLE_SPLIT_CELLS ;
-        };
-        ToolBoxItem
-        {
-            DropDown = TRUE ;
-            Identifier = FN_OPTIMIZE_TABLE ;
-            HelpID = FN_OPTIMIZE_TABLE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_INSERT_ROW ;
-            HelpID = FN_TABLE_INSERT_ROW ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_INSERT_COL ;
-            HelpID = FN_TABLE_INSERT_COL ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_DELETE_ROW ;
-            HelpID = FN_TABLE_DELETE_ROW ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_DELETE_COL ;
-            HelpID = FN_TABLE_DELETE_COL ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SELECT_ALL;
-            HelpID = FN_TABLE_SELECT_ALL;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SELECT_COL;
-            HelpID = FN_TABLE_SELECT_COL;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_SELECT_ROW;
-            HelpID = FN_TABLE_SELECT_ROW;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_VERT_NONE;
-            HelpID = FN_TABLE_VERT_NONE;
-            RadioCheck = TRUE;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_VERT_CENTER;
-            HelpID = FN_TABLE_VERT_CENTER;
-            RadioCheck = TRUE;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TABLE_VERT_BOTTOM;
-            HelpID = FN_TABLE_VERT_BOTTOM;
-            RadioCheck = TRUE;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_BORDER
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_FRAME_LINESTYLE
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_FRAME_LINECOLOR
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_BACKGROUND_COLOR
-        };
-    };
-};
 String RID_FRAME_TOOLBOX
 {
         Text [ en-US ] = "Frame Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_FRAME_TOOLBOX
-{
-    HelpID = HID_FRAME_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    MenuStrings = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FRAME_WRAP
-        MN_FRAME1
-        MN_FRAME2
-        MN_FRAME3
-        MN_LINESTYLE
-        MN_BACKGROUND_COLOR
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_FRAME
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_LAYER
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_CHAIN ;
-            HelpID = FN_FRAME_CHAIN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_UNCHAIN ;
-            HelpID = FN_FRAME_UNCHAIN ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_GRAFIK_TOOLBOX
 {
         Text [ en-US ] = "Graphics Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_GRAFIK_TOOLBOX
-{
-    HelpID = HID_GRAFIK_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    MenuStrings = TRUE ;
-    Customize = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_GRFFILTER;
-            HelpID = SID_GRFFILTER;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_MODE;
-            HelpID = SID_ATTR_GRAF_MODE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_RED;
-            HelpID = SID_ATTR_GRAF_RED;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_GREEN;
-            HelpID = SID_ATTR_GRAF_GREEN;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_BLUE;
-            HelpID = SID_ATTR_GRAF_BLUE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_LUMINANCE;
-            HelpID = SID_ATTR_GRAF_LUMINANCE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_CONTRAST;
-            HelpID = SID_ATTR_GRAF_CONTRAST;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_GAMMA;
-            HelpID = SID_ATTR_GRAF_GAMMA;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTR_GRAF_TRANSPARENCE;
-            HelpID = SID_ATTR_GRAF_TRANSPARENCE;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        ToolBoxItem
-        {
-            Identifier = FN_FLIP_VERT_GRAFIC ;
-            HelpID = FN_FLIP_VERT_GRAFIC ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FLIP_HORZ_GRAFIC ;
-            HelpID = FN_FLIP_HORZ_GRAFIC ;
-        };
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_GRAFIK
-    };
-    Scroll = TRUE ;
-};
 String RID_OLE_TOOLBOX
 {
         Text [ en-US ] = "Object" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_OLE_TOOLBOX
-{
-    HelpID = HID_OLE_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    Scroll = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FRAME_WRAP
-        MN_CONTOUR
-        MN_FRAME1
-        MN_FRAME2
-        MN_FRAME3
-        MN_LINESTYLE
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_ATTRIBUTES_OLE
-        ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
-        MN_LAYER
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-    };
-};
 String RID_DRAW_TOOLBOX
 {
         Text [ en-US ] = "Draw Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_DRAW_TOOLBOX
-{
-    HelpID = HID_DRAW_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_EDIT ;
-            HelpID = SID_BEZIER_EDIT ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTRIBUTES_LINE ;
-            HelpID = SID_ATTRIBUTES_LINE ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINEEND_STYLE
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINE_STYLE
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINE_WIDTH
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_LINE_COLOR
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_ATTRIBUTES_AREA ;
-            HelpID = SID_ATTRIBUTES_AREA ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_FILL_STYLE
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_OBJECT_ROTATE
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_TOOL_ANKER ;
-            HelpID = FN_TOOL_ANKER ;
-            DropDown = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_NOWRAP ;
-            HelpID = FN_FRAME_NOWRAP ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP ;
-            HelpID = FN_FRAME_WRAP ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_IDEAL ;
-            HelpID = FN_FRAME_WRAP_IDEAL ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_LEFT ;
-            HelpID = FN_FRAME_WRAP_LEFT ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_RIGHT ;
-            HelpID = FN_FRAME_WRAP_RIGHT ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAPTHRU ;
-            HelpID = FN_FRAME_WRAPTHRU ;
-            RadioCheck = TRUE ;
-            Hide = TRUE;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_FRAME_WRAP_CONTOUR ;
-            HelpID = FN_FRAME_WRAP_CONTOUR ;
-            Hide = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OBJECT_HEAVEN ;
-            HelpID = SID_OBJECT_HEAVEN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OBJECT_HELL ;
-            HelpID = SID_OBJECT_HELL ;
-        };
-        MN_LAYER
-        MN_GRID( HIDE=TRUE )
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_OBJECT_ALIGN ;
-            HelpID = SID_OBJECT_ALIGN ;
-            DropDown = TRUE ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_BEZIER_TOOLBOX
 {
         Text [ en-US ] = "Bézier Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_BEZIER_TOOLBOX
-{
-    HelpID = HID_BEZIER_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_EDIT ;
-            HelpID = SID_BEZIER_EDIT ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_MOVE ;
-            HelpID = SID_BEZIER_MOVE ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_INSERT ;
-            HelpID = SID_BEZIER_INSERT ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_DELETE ;
-            HelpID = SID_BEZIER_DELETE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_CUTLINE ;
-            HelpID = SID_BEZIER_CUTLINE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_CONVERT ;
-            HelpID = SID_BEZIER_CONVERT ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_EDGE ;
-            HelpID = SID_BEZIER_EDGE ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_SMOOTH ;
-            HelpID = SID_BEZIER_SMOOTH ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_SYMMTR ;
-            HelpID = SID_BEZIER_SYMMTR ;
-            RadioCheck = TRUE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_CLOSE ;
-            HelpID = SID_BEZIER_CLOSE ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_BEZIER_ELIMINATE_POINTS ;
-            HelpID = SID_BEZIER_ELIMINATE_POINTS ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String RID_DRAW_TEXT_TOOLBOX
 {
     Text [ en-US ] = "Text Object Bar/Graphics" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_DRAW_TEXT_TOOLBOX
-{
-    HelpID = HID_DRAW_TEXT_TOOLBOX ;
-    Border = TRUE ;
-    Customize = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_FONT
-        MN_TEXT1(FALSE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LINESPACE
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_CHAR_COLOR
-            Hide = TRUE;
-        };
-        MN_TEXT_LTR_RTL
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-            HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-            HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-        };
-
-        MN_TEXT_DIALOGS(FALSE)
-    };
-    ItemList[ ar ] =
-    {
-        MN_FONT
-        MN_TEXT1_RTL(FALSE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LINESPACE
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_CHAR_COLOR
-            Hide = TRUE;
-        };
-        MN_TEXT_RTL_LTR
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-            HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-            HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-        };
-
-        MN_TEXT_DIALOGS(FALSE)
-    };
-    ItemList[ he ] =
-    {
-        MN_FONT
-        MN_TEXT1_RTL(FALSE)
-        MN_TEXT1_BLOCK
-        MN_TEXT_LINESPACE
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            ITEM_TOOLBAR_ATTR_CHAR_COLOR
-            Hide = TRUE;
-        };
-        MN_TEXT_RTL_LTR
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-            HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ;
-        };
-        ToolBoxItem
-        {
-            Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-            HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ;
-        };
-
-        MN_TEXT_DIALOGS(FALSE)
-    };
-    Scroll = TRUE ;
-};
 String RID_NUM_TOOLBOX
 {
         Text [ en-US ] = "Numbering Object Bar" ;
     Text [ x-comment ] = " ";
 };
-ToolBox RID_NUM_TOOLBOX
-{
-    HelpID = HID_NUM_TOOLBOX ;
-    Border = TRUE ;
-    SVLook = TRUE ;
-    Dockable = TRUE ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    LineSpacing = TRUE ;
-    HideWhenDeactivate = TRUE ;
-    Customize = TRUE ;
-    MenuStrings = TRUE ;
-    Hide = TRUE ;
-    ItemList =
-    {
-        MN_TEMPLATE
-        MN_FONT
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OFF ;
-            HelpID = FN_NUM_BULLET_OFF ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_UP ;
-            HelpID = FN_NUM_BULLET_UP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_DOWN ;
-            HelpID = FN_NUM_BULLET_DOWN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_UP ;
-            HelpID = FN_NUM_BULLET_OUTLINE_UP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_DOWN ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_NONUM ;
-            HelpID = FN_NUM_BULLET_NONUM ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_MOVEUP ;
-            HelpID = FN_NUM_BULLET_MOVEUP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_MOVEDOWN ;
-            HelpID = FN_NUM_BULLET_MOVEDOWN ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_MOVEUP ;
-            HelpID = FN_NUM_BULLET_OUTLINE_MOVEUP ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUM_BULLET_OUTLINE_MOVEDOWN ;
-            HelpID = FN_NUM_BULLET_OUTLINE_MOVEDOWN ;
-        };
-        ToolBoxItem
-        {
-            Type = TOOLBOXITEM_SEPARATOR ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUMBER_NEWSTART ;
-            HelpID = FN_NUMBER_NEWSTART ;
-        };
-        ToolBoxItem
-        {
-            Identifier = FN_NUMBER_BULLETS ;
-            HelpID = FN_NUMBER_BULLETS ;
-        };
-    };
-    Scroll = TRUE ;
-};
 String STR_SHELLNAME_TEXT
 {
         Text [ en-US ] = "Text" ;
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 5f3389791122..f87bc0d41208 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -961,10 +961,11 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case FN_TABLE_INSERT_COL_DLG:
         case FN_TABLE_INSERT_ROW_DLG:
         {
+            const SfxSlot* pSlot = GetStaticInterface()->GetSlot(nSlot);
             if ( FN_TABLE_INSERT_ROW_DLG != nSlot || !rSh.IsInRepeatedHeadline())
             {
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, nSlot) : 0);
+                ::std::auto_ptr<SvxAbstractInsRowColDlg> pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, pSlot->GetCommand() ) : 0);
 
                 if( pDlg.get() && (pDlg->Execute() == 1) )
                 {
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index f1ca35df298a..3f63462f129d 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -124,7 +124,7 @@
 #include <view.hxx>
 #include <ndtxt.hxx>
 #include <pam.hxx>
-
+#include <sfx2/objface.hxx>
 #include <langhelper.hxx>
 
 using namespace ::com::sun::star;
@@ -274,14 +274,11 @@ short lcl_AskRedlineMode(Window *pWin)
                         BUTTONDIALOG_FOCUSBUTTON;
 
     aQBox.AddButton(String(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags);
-    // FIXME: HELPID
-    aQBox.GetPushButton( RET_OK )->SetHelpId(""/*HID_AUTOFORMAT_ACCEPT*/);
+    aQBox.GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT);
     aQBox.AddButton(String(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
-    // FIXME: HELPID
-    aQBox.GetPushButton( RET_CANCEL )->SetHelpId(""/*HID_AUTOFORMAT_REJECT*/  );
+    aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT  );
     aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0);
-    // FIXME: HELPID
-    aQBox.GetPushButton( 2 )->SetHelpId(""/*HID_AUTOFORMAT_EDIT_CHG*/);
+    aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG);
     aQBox.SetButtonHelpText( RET_OK, aEmptyStr );
 
     return aQBox.Execute();
@@ -441,7 +438,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             AbstractInsFootNoteDlg* pDlg = pFact->CreateInsFootNoteDlg( DLG_INS_FOOTNOTE,
                                                         GetView().GetWindow(), rWrtSh, FALSE );
             DBG_ASSERT(pDlg, "Dialogdiet fail!");
-            pDlg->SetHelpId(nSlot);
+            pDlg->SetHelpId(GetStaticInterface()->GetSlot(nSlot)->GetCommand());
             if ( pDlg->Execute() == RET_OK )
             {
                 USHORT nId = pDlg->IsEndNote() ? FN_INSERT_ENDNOTE : FN_INSERT_FOOTNOTE;