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

6 files changed, 19 insertions, 246 deletions

diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index f7d9067a1ded..c14f91632a4c 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -90,8 +90,7 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
     InsertSeparator ( 1 );
     InsertSeparator ();
     InsertWindow( ED_FORMULA, &aEdit);
-    // FIXME: HELPID
-    SetHelpId(ED_FORMULA, ""/*HID_EDIT_FORMULA*/);
+    SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
 
     BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
     SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC, bHC ));
diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src
index 13d5fcdd0eae..5686fd7ae6c2 100644
--- a/sw/source/ui/ribbar/inputwin.src
+++ b/sw/source/ui/ribbar/inputwin.src
@@ -44,7 +44,7 @@ ToolBox RID_TBX_FORMULA
         ToolBoxItem
         {
             Identifier = FN_FORMULA_CALC ;
-            HelpID = FN_FORMULA_CALC ;
+            HelpId = HID_TBX_FORMULA_CALC ;
             DropDown = TRUE ;
             Text [ en-US ] = "Formula" ;
             /* ### ACHTUNG: Neuer Text in Resource? Formel ausw�hlen : Formel ausw�hlen */
@@ -52,14 +52,14 @@ ToolBox RID_TBX_FORMULA
         ToolBoxItem
         {
             Identifier = FN_FORMULA_CANCEL ;
-            HelpID = FN_FORMULA_CANCEL ;
+            HelpId = HID_TBX_FORMULA_CANCEL ;
             Text [ en-US ] = "Cancel" ;
             /* ### ACHTUNG: Neuer Text in Resource? Formel nicht �benehmen : Formel nicht �benehmen */
         };
         ToolBoxItem
         {
             Identifier = FN_FORMULA_APPLY ;
-            HelpID = FN_FORMULA_APPLY ;
+            HelpId = HID_TBX_FORMULA_APPLY ;
             /* ### ACHTUNG: Neuer Text in Resource? �bernehmen : �bernehmen */
             Text [ en-US ] = "Apply" ;
             /* ### ACHTUNG: Neuer Text in Resource? Formel einf�gen : Formel einf�gen */
@@ -287,21 +287,21 @@ String STR_TBL_FORMULA
     ToolBoxItem\
     {\
         Identifier = FN_FORMULA_CALC ; \
-        HelpID = FN_FORMULA_CALC ; \
+        HelpID = HID_TBX_FORMULA_CALC ; \
         Text [ en-US ] = "Formula" ; \
         /* ### ACHTUNG: Neuer Text in Resource? Formel ausw�hlen : Formel ausw�hlen */\
     };\
     ToolBoxItem\
     {\
         Identifier = FN_FORMULA_CANCEL ; \
-        HelpID = FN_FORMULA_CANCEL ; \
+        HelpId = HID_TBX_FORMULA_CANCEL ; \
         Text [ en-US ] = "Cancel" ; \
         /* ### ACHTUNG: Neuer Text in Resource? Formel nicht �benehmen : Formel nicht �benehmen */\
     };\
     ToolBoxItem\
     {\
         Identifier = FN_FORMULA_APPLY ; \
-        HelpID = FN_FORMULA_APPLY ; \
+        HelpID = HID_TBX_FORMULA_APPLY ; \
         /* ### ACHTUNG: Neuer Text in Resource? �bernehmen : �bernehmen */\
         Text [ en-US ] = "Apply" ; \
         /* ### ACHTUNG: Neuer Text in Resource? Formel einf�gen : Formel einf�gen */\
diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk
index 72acc793070a..3a9edfee238b 100644
--- a/sw/source/ui/ribbar/makefile.mk
+++ b/sw/source/ui/ribbar/makefile.mk
@@ -42,7 +42,6 @@ SRS1NAME=$(TARGET)
 SRC1FILES =  \
         tbxanchr.src \
         inputwin.src \
-        tblctrl.src \
         workctrl.src
 
 SLOFILES =  \
diff --git a/sw/source/ui/ribbar/tblctrl.src b/sw/source/ui/ribbar/tblctrl.src
deleted file mode 100644
index 0c783172af74..000000000000
--- a/sw/source/ui/ribbar/tblctrl.src
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-#include "tblctrl.hrc"
-#include "helpid.h"
-#include "cmdid.h"
-FloatingWindow RID_TBL_OPT_CTRL
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_TBL_OPT_CTRL ;
-    ToolBox TBX_OPTIMIZE_TABLE
-    {
-        MenuStrings = TRUE ;
-        SVLook = TRUE ;
-        HelpID = 1 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_BALANCE_CELLS ;
-                HelpID = FN_TABLE_BALANCE_CELLS ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_BALANCE_ROWS ;
-                HelpID = FN_TABLE_BALANCE_ROWS ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_OPTIMAL_HEIGHT ;
-                HelpID = FN_TABLE_OPTIMAL_HEIGHT ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_TABLE_ADJUST_CELLS ;
-                HelpID = FN_TABLE_ADJUST_CELLS ;
-            };
-        };
-    };
-    Text [ en-US ] = "Optimize" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index aaa5b19b1f4e..cf7f4b15a33a 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -454,7 +454,7 @@ static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] =
     NID_TABLE_FORMULA_ERROR,
     NID_NEXT
 };
-static USHORT __READONLY_DATA aNavigationHelpIds[ NAVI_ENTRIES ] =
+static const char* __READONLY_DATA aNavigationHelpIds[ NAVI_ENTRIES ] =
 {
     // -- first line
     HID_NID_TBL,
@@ -492,8 +492,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr
 {
     USHORT i;
 
-    // FIXME: HELPID
-    aToolBox.SetHelpId(""/*HID_NAVI_VS*/);
+    aToolBox.SetHelpId(HID_NAVI_VS);
     aToolBox.SetLineCount( 2 );
     aToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT);
     for( i = 0; i < NID_COUNT; i++)
@@ -509,8 +508,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr
             nTbxBits = TIB_CHECKABLE;
         }
         aToolBox.InsertItem(nNaviId, sText, nTbxBits);
-        // FIXME: HELPID
-        aToolBox.SetHelpId( nNaviId, ""/*aNavigationHelpIds[i]*/ );
+        aToolBox.SetHelpId( nNaviId, aNavigationHelpIds[i] );
     }
     ApplyImageList();
     aToolBox.InsertBreak(NID_COUNT/2);
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 93681f526502..4fff5c4a9260 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -32,138 +32,9 @@
 #include <svx/globlmn.hrc>
 #endif
 #include "workctrl.hrc"
-#include "workctrl.hrc"
 #include "helpid.h"
 #include "cmdid.h"
-FloatingWindow RID_INSERT_CTRL
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_INSERT_CTRL ;
-    /* ### ACHTUNG: Neuer Text in Resource? Einf�gen : Einf�gen */
-    ToolBox TBX_INSERT
-    {
-        MenuStrings = TRUE ;
-        SVLook = TRUE ;
-        HelpID = 1 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_FRAME_INTERACT_NOCOL ;
-                HelpID = FN_INSERT_FRAME_INTERACT_NOCOL ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_FRAME_INTERACT ;
-                HelpID = FN_INSERT_FRAME_INTERACT ;
-                DropDown = TRUE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_GRAPHIC ;
-                HelpID = SID_INSERT_GRAPHIC ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_TABLE ;
-                HelpID = FN_INSERT_TABLE ;
-                DropDown = TRUE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERTDOC ;
-                HelpID = SID_INSERTDOC ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_FOOTNOTE ;
-                HelpID = FN_INSERT_FOOTNOTE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_ENDNOTE ;
-                HelpID = FN_INSERT_ENDNOTE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_SYMBOL ;
-                HelpID = FN_INSERT_SYMBOL ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_REGION ;
-                HelpID = FN_INSERT_REGION;
-                DropDown = TRUE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_IDX_ENTRY_DLG ;
-                HelpID = FN_INSERT_IDX_ENTRY_DLG ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_BOOKMARK ;
-                HelpID = FN_INSERT_BOOKMARK ;
-                RadioCheck = TRUE ;
-            };
-        };
-    };
-    Text [ en-US ] = "Insert" ;
-};
-FloatingWindow RID_INSERT_OBJ_CTRL
-{
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_INSERT_OBJ_CTRL ;
-    /* ### ACHTUNG: Neuer Text in Resource? Objekt einf�gen : Objekt einf�gen */
-    ToolBox TBX_OBJ_INSERT
-    {
-        MenuStrings = TRUE ;
-        SVLook = TRUE ;
-        HelpID = 1 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_DIAGRAM ;
-                HelpID = SID_INSERT_DIAGRAM ;
-            };
-            ToolBoxItem
-            {
-                Identifier = FN_INSERT_SMA ;
-                HelpID = FN_INSERT_SMA ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_FLOATINGFRAME ;
-                HelpID = SID_INSERT_FLOATINGFRAME ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_OBJECT ;
-                HelpID = SID_INSERT_OBJECT ;
-            };
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_PLUGIN ;
-                HelpID = SID_INSERT_PLUGIN ;
-            };
-#ifdef SOLAR_JAVA
-            ToolBoxItem
-            {
-                Identifier = SID_INSERT_APPLET ;
-                HelpID = SID_INSERT_APPLET ;
-            };
-#endif
-        };
-    };
-    Text [ en-US ] = "Insert Object" ;
-};
+
 Menu RID_INSERT_FIELD_CTRL
 {
     ItemList =
@@ -171,45 +42,45 @@ Menu RID_INSERT_FIELD_CTRL
         MenuItem
         {
             Identifier = FN_INSERT_FLD_DATE ;
-            HelpID = FN_INSERT_FLD_DATE ;
+            HelpId = CMD_FN_INSERT_FLD_DATE ;
             Text [ en-US ] = "Date" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_TIME ;
-            HelpID = FN_INSERT_FLD_TIME ;
+            HelpId = CMD_FN_INSERT_FLD_TIME ;
             Text [ en-US ] = "Time" ;
         };
          //#ifndef MN_SW_WEB
         MenuItem
         {
             Identifier = FN_INSERT_FLD_PGNUMBER ;
-            HelpID = FN_INSERT_FLD_PGNUMBER ;
+            HelpId = CMD_FN_INSERT_FLD_PGNUMBER ;
             Text [ en-US ] = "Page Number" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_PGCOUNT ;
-            HelpID = FN_INSERT_FLD_PGCOUNT ;
+            HelpId = CMD_FN_INSERT_FLD_PGCOUNT ;
             Text [ en-US ] = "Page Count" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_TOPIC ;
-            HelpID = FN_INSERT_FLD_TOPIC ;
+            HelpId = CMD_FN_INSERT_FLD_TOPIC ;
             Text [ en-US ] = "Subject" ;
         };
         MenuItem
         {
             Identifier = FN_INSERT_FLD_TITLE ;
-            HelpID = FN_INSERT_FLD_TITLE ;
+            HelpId = CMD_FN_INSERT_FLD_TITLE ;
             Text [ en-US ] = "Title" ;
         };
          //#endif
         MenuItem
         {
             Identifier = FN_INSERT_FLD_AUTHOR ;
-            HelpID = FN_INSERT_FLD_AUTHOR ;
+            HelpId = CMD_FN_INSERT_FLD_AUTHOR ;
             Text [ en-US ] = "Author" ;
         };
         MenuItem
@@ -219,7 +90,7 @@ Menu RID_INSERT_FIELD_CTRL
         MenuItem
         {
             Identifier = FN_INSERT_FIELD ;
-            HelpID = FN_INSERT_FIELD ;
+            HelpId = CMD_FN_INSERT_FIELD ;
             Text [ en-US ] = "Other..." ;
         };
     };