CWS gnumake: resync to m91; conflicts unresolved

4 files changed, 84 insertions, 37 deletions

diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 4ddcba5d8ba8..3dac7faf3a90 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -34,6 +34,7 @@
 
 TabPage RID_SVX_XFORMS_TABPAGES
 {
+    HelpID = "svx:TabPage:RID_SVX_XFORMS_TABPAGES";
     Hide = TRUE ;
     DialogControl = TRUE;
     Size = MAP_APPFONT ( 63 , 100 ) ;
@@ -348,6 +349,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     Edit ED_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME";
         Pos = MAP_APPFONT ( 78 , 14 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
@@ -361,12 +363,14 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     Edit ED_DEFAULT
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT";
         Pos = MAP_APPFONT ( 78 , 29 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
     };
     PushButton PB_DEFAULT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT";
         Pos = MAP_APPFONT ( 160 , 29 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -388,6 +392,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     ListBox LB_DATATYPE
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE";
         Pos = MAP_APPFONT ( 78 , 55 ) ;
         Size = MAP_APPFONT ( 96 , 45 ) ;
         Border = TRUE ;
@@ -395,6 +400,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_REQUIRED
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED";
         Pos = MAP_APPFONT ( 6 , 72 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -402,6 +408,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_REQUIRED
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED";
         Pos = MAP_APPFONT ( 78 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -409,6 +416,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_RELEVANT
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT";
         Pos = MAP_APPFONT ( 6 , 89 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -416,6 +424,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_RELEVANT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT";
         Pos = MAP_APPFONT ( 78 , 87 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -423,6 +432,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_CONSTRAINT
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT";
         Pos = MAP_APPFONT ( 6 , 106 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -430,6 +440,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_CONSTRAINT
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT";
         Pos = MAP_APPFONT ( 78 , 104 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -437,6 +448,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_READONLY
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY";
         Pos = MAP_APPFONT ( 6 , 123 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -444,6 +456,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_READONLY
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY";
         Pos = MAP_APPFONT ( 78 , 121 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -451,6 +464,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     CheckBox CB_CALCULATE
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE";
         Pos = MAP_APPFONT ( 6 , 140 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -458,6 +472,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM
     };
     PushButton PB_CALCULATE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE";
         Pos = MAP_APPFONT ( 78 , 138 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -574,6 +589,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION
     };
     MultiLineEdit ED_CONDITION
     {
+        HelpID = "svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 198 , 34 ) ;
@@ -599,6 +615,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION
     };
     PushButton PB_EDIT_NAMESPACES
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES";
         Pos = MAP_APPFONT ( 132 , 102 ) ;
         Size = MAP_APPFONT ( 72 , 14 ) ;
         TabStop = TRUE ;
@@ -655,6 +672,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
     };
     PushButton PB_ADD_NAMESPACE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE";
         Pos = MAP_APPFONT ( 184 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -662,6 +680,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
     };
     PushButton PB_EDIT_NAMESPACE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE";
         Pos = MAP_APPFONT ( 184 , 31 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -669,6 +688,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
     };
     PushButton PB_DELETE_NAMESPACE
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE";
         Pos = MAP_APPFONT ( 184 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -725,6 +745,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE
     };
     Edit ED_PREFIX
     {
+        HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX";
         Pos = MAP_APPFONT ( 6 , 14 ) ;
         Size = MAP_APPFONT ( 45 , 12 ) ;
         Border = TRUE;
@@ -738,6 +759,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE
     };
     Edit ED_URL
     {
+        HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL";
         Pos = MAP_APPFONT ( 54 , 14 ) ;
         Size = MAP_APPFONT ( 150 , 12 ) ;
         Border = TRUE;
@@ -795,6 +817,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     Edit ED_SUBMIT_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME";
         Pos = MAP_APPFONT ( 78 , 14 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
@@ -808,6 +831,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     Edit ED_SUBMIT_ACTION
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION";
         Pos = MAP_APPFONT ( 78 , 29 ) ;
         Size = MAP_APPFONT ( 96 , 12 ) ;
         Border = TRUE ;
@@ -821,6 +845,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     ListBox LB_SUBMIT_METHOD
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD";
         Pos = MAP_APPFONT ( 78 , 44 ) ;
         Size = MAP_APPFONT ( 96 , 51 ) ;
         Border = TRUE ;
@@ -835,12 +860,14 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     Edit ED_SUBMIT_REF
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF";
         Pos = MAP_APPFONT ( 78 , 60 ) ;
         Size = MAP_APPFONT ( 79, 12 ) ;
         Border = TRUE ;
     };
     PushButton PB_SUBMIT_REF
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF";
         Pos = MAP_APPFONT ( 159 , 59 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -855,6 +882,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     ListBox LB_SUBMIT_BIND
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND";
         Pos = MAP_APPFONT ( 78 , 75 ) ;
         Size = MAP_APPFONT ( 96 , 51 ) ;
         Border = TRUE ;
@@ -869,6 +897,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
     ListBox LB_SUBMIT_REPLACE
     {
+        HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE";
         Pos = MAP_APPFONT ( 78 , 90 ) ;
         Size = MAP_APPFONT ( 96 , 51 ) ;
         Border = TRUE ;
@@ -949,12 +978,14 @@ ModalDialog RID_SVXDLG_ADD_MODEL
     };
     Edit ED_INST_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME";
         Pos = MAP_APPFONT ( 60 , 14 ) ;
         Size = MAP_APPFONT ( 114 , 12 ) ;
         Border = TRUE ;
     };
     CheckBox CB_MODIFIES_DOCUMENT
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT";
         Pos = MAP_APPFONT( 6, 32 );
         Size = MAP_APPFONT( 168, 16 );
         Top = TRUE;
@@ -1015,6 +1046,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     Edit ED_INST_NAME
     {
+        HelpID = "svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME";
         Pos = MAP_APPFONT ( 60 , 14 ) ;
         Size = MAP_APPFONT ( 144 , 12 ) ;
         Border = TRUE ;
@@ -1028,6 +1060,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     ComboBox ED_INST_URL
     {
+        HelpID = "svx:ComboBox:RID_SVXDLG_ADD_INSTANCE:ED_INST_URL";
         Pos = MAP_APPFONT ( 60 , 29 ) ;
         Size = MAP_APPFONT ( 127 , 48 ) ;
         DropDown = TRUE ;
@@ -1035,6 +1068,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     PushButton PB_FILEPICKER
     {
+        HelpID = "svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER";
         Pos = MAP_APPFONT ( 190 , 28 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = TRUE ;
@@ -1042,6 +1076,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE
     };
     CheckBox CB_INST_LINKINST
     {
+        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST";
         Pos = MAP_APPFONT ( 6 , 44 ) ;
         Size = MAP_APPFONT ( 198 , 10 ) ;
         TabStop = TRUE ;
diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src
index 45aa7ef1721a..5a0fd1cb273c 100644
--- a/svx/source/form/filtnav.src
+++ b/svx/source/form/filtnav.src
@@ -26,7 +26,13 @@
  ************************************************************************/
 
 #include <svx/svxids.hrc>
+<<<<<<< local
 #include "svx/fmresids.hrc"
+=======
+#include "fmresids.hrc"
+#include "fmhelp.hrc"
+
+>>>>>>> other
 Menu RID_FM_FILTER_MENU
 {
     ItemList =
@@ -34,25 +40,25 @@ Menu RID_FM_FILTER_MENU
         MenuItem
         {
             Identifier = SID_FM_DELETE ;
-            HelpID = SID_FM_DELETE ;
+            HelpId = HID_FM_DELETE;
             Text [ en-US ] = "~Delete" ;
         };
         MenuItem
         {
             Identifier = SID_FM_FILTER_EDIT ;
-            HelpID = SID_FM_FILTER_EDIT ;
+            HelpId = HID_FM_FILTER_EDIT;
             Text [ en-US ] = "~Edit" ;
         };
         MenuItem
         {
             Identifier = SID_FM_FILTER_IS_NULL ;
-            HelpID = SID_FM_FILTER_IS_NULL ;
+            HelpId = HID_FM_FILTER_IS_NULL;
             Text [ en-US ] = "~Is Null" ;
         };
         MenuItem
         {
             Identifier = SID_FM_FILTER_IS_NOT_NULL ;
-            HelpID = SID_FM_FILTER_IS_NOT_NULL ;
+            HelpId = HID_FM_FILTER_IS_NOT_NULL;
             Text [ en-US ] = "I~s not Null" ;
         };
     };
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 45c721d47972..8d6866f0ecdb 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -29,6 +29,9 @@
 #include "svx/fmresids.hrc"
 #include "fmexpl.hrc"
 #include "globlmn.hrc"
+#include <svx/svxcommands.h>
+#include "fmhelp.hrc"
+
 Menu RID_FMEXPLORER_POPUPMENU
 {
     ItemList =
@@ -36,7 +39,7 @@ Menu RID_FMEXPLORER_POPUPMENU
         MenuItem
         {
             Identifier = SID_FM_NEW ;
-            HelpID = SID_FM_NEW ;
+            HelpId = HID_FM_NEW ;
             Text [ en-US ] = "~New" ;
             SubMenu = Menu
             {
@@ -45,13 +48,13 @@ Menu RID_FMEXPLORER_POPUPMENU
                     MenuItem
                     {
                         Identifier = SID_FM_NEW_FORM ;
-                        HelpID = SID_FM_NEW_FORM ;
+                        HelpId = HID_FM_NEW_FORM ;
                         Text [ en-US ] = "Form" ;
                     };
                     MenuItem
                     {
                         Identifier = SID_FM_NEW_HIDDEN ;
-                        HelpID = SID_FM_NEW_HIDDEN ;
+                        HelpId = HID_FM_NEW_HIDDEN ;
                         Text [ en-US ] = "Hidden Control" ;
                     };
                 };
@@ -60,7 +63,7 @@ Menu RID_FMEXPLORER_POPUPMENU
         MenuItem
         {
             Identifier = SID_FM_CHANGECONTROLTYPE ;
-            HelpID = SID_FM_CHANGECONTROLTYPE ;
+            HelpId = CMD_SID_FM_CHANGECONTROLTYPE ;
             Text [ en-US ] = "Replace with";
         };
         MenuItem { ITEM_EDIT_CUT };
@@ -69,37 +72,37 @@ Menu RID_FMEXPLORER_POPUPMENU
         MenuItem
         {
             Identifier = SID_FM_DELETE ;
-            HelpID = SID_FM_DELETE ;
+            HelpId = HID_FM_DELETE ;
             Text [ en-US ] = "~Delete" ;
         };
         MenuItem
         {
             Identifier = SID_FM_TAB_DIALOG ;
-            HelpID = SID_FM_TAB_DIALOG ;
+            HelpId = CMD_SID_FM_TAB_DIALOG ;
             Text [ en-US ] = "Tab Order..." ;
         };
         MenuItem
         {
             Identifier = SID_FM_RENAME_OBJECT ;
-            HelpID = SID_FM_RENAME_OBJECT ;
+            HelpId = HID_FM_RENAME_OBJECT ;
             Text [ en-US ] = "~Rename" ;
         };
         MenuItem
         {
             Identifier = SID_FM_SHOW_PROPERTY_BROWSER ;
-            HelpID = SID_FM_SHOW_PROPERTY_BROWSER ;
+            HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ;
             Text [ en-US ] = "Propert~ies" ;
         };
         MenuItem
         {
             Identifier = SID_FM_OPEN_READONLY ;
-            HelpID = SID_FM_OPEN_READONLY ;
+            HelpId = CMD_SID_FM_OPEN_READONLY ;
             Text [ en-US ] = "Open in Design Mode" ;
         };
         MenuItem
         {
             Identifier = SID_FM_AUTOCONTROLFOCUS ;
-            HelpID = SID_FM_AUTOCONTROLFOCUS ;
+            HelpId = CMD_SID_FM_AUTOCONTROLFOCUS ;
             Text [ en-US ] = "Automatic Control Focus";
         };
     };
@@ -112,140 +115,140 @@ Menu RID_FMSHELL_CONVERSIONMENU
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_EDIT ;
-            HelpID = SID_FM_CONVERTTO_EDIT ;
+            HelpId = CMD_SID_FM_CONVERTTO_EDIT ;
             Command = ".uno:ConvertToEdit" ;
             Text [ en-US ] = "~Text Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_BUTTON ;
-            HelpID = SID_FM_CONVERTTO_BUTTON ;
+            HelpId = CMD_SID_FM_CONVERTTO_BUTTON ;
             Command = ".uno:ConvertToButton" ;
             Text [ en-US ] = "~Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_FIXEDTEXT ;
-            HelpID = SID_FM_CONVERTTO_FIXEDTEXT ;
+            HelpId = CMD_SID_FM_CONVERTTO_FIXEDTEXT ;
             Command = ".uno:ConvertToFixed" ;
             Text [ en-US ] = "La~bel field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_GROUPBOX ;
-            HelpID = SID_FM_CONVERTTO_GROUPBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_GROUPBOX ;
             Command = ".uno:ConvertToGroup" ;
             Text [ en-US ] = "G~roup Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_LISTBOX ;
-            HelpID = SID_FM_CONVERTTO_LISTBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_LISTBOX ;
             Command = ".uno:ConvertToList" ;
             Text [ en-US ] = "L~ist Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_CHECKBOX ;
-            HelpID = SID_FM_CONVERTTO_CHECKBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_CHECKBOX ;
             Command = ".uno:ConvertToCheckBox" ;
             Text [ en-US ] = "~Check Box";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_RADIOBUTTON ;
-            HelpID = SID_FM_CONVERTTO_RADIOBUTTON ;
+            HelpId = CMD_SID_FM_CONVERTTO_RADIOBUTTON ;
             Command = ".uno:ConvertToRadio" ;
             Text [ en-US ] = "~Radio Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_COMBOBOX ;
-            HelpID = SID_FM_CONVERTTO_COMBOBOX ;
+            HelpId = CMD_SID_FM_CONVERTTO_COMBOBOX ;
             Command = ".uno:ConvertToCombo" ;
             Text [ en-US ] = "Combo Bo~x";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_IMAGEBUTTON ;
-            HelpID = SID_FM_CONVERTTO_IMAGEBUTTON ;
+            HelpId = CMD_SID_FM_CONVERTTO_IMAGEBUTTON ;
             Command = ".uno:ConvertToImageBtn" ;
             Text [ en-US ] = "I~mage Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_FILECONTROL ;
-            HelpID = SID_FM_CONVERTTO_FILECONTROL ;
+            HelpId = CMD_SID_FM_CONVERTTO_FILECONTROL ;
             Command = ".uno:ConvertToFileControl" ;
             Text [ en-US ] = "~File Selection";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_DATE ;
-            HelpID = SID_FM_CONVERTTO_DATE ;
+            HelpId = CMD_SID_FM_CONVERTTO_DATE ;
             Command = ".uno:ConvertToDate" ;
             Text [ en-US ] = "~Date Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_TIME ;
-            HelpID = SID_FM_CONVERTTO_TIME ;
+            HelpId = CMD_SID_FM_CONVERTTO_TIME ;
             Command = ".uno:ConvertToTime" ;
             Text [ en-US ] = "Tim~e Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_NUMERIC ;
-            HelpID = SID_FM_CONVERTTO_NUMERIC ;
+            HelpId = CMD_SID_FM_CONVERTTO_NUMERIC ;
             Command = ".uno:ConvertToNumeric" ;
             Text [ en-US ] = "~Numerical Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_CURRENCY ;
-            HelpID = SID_FM_CONVERTTO_CURRENCY ;
+            HelpId = CMD_SID_FM_CONVERTTO_CURRENCY ;
             Command = ".uno:ConvertToCurrency" ;
             Text [ en-US ] = "C~urrency Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_PATTERN ;
-            HelpID = SID_FM_CONVERTTO_PATTERN ;
+            HelpId = CMD_SID_FM_CONVERTTO_PATTERN ;
             Command = ".uno:ConvertToPattern" ;
             Text [ en-US ] = "~Pattern Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_IMAGECONTROL ;
-            HelpID = SID_FM_CONVERTTO_IMAGECONTROL ;
+            HelpId = CMD_SID_FM_CONVERTTO_IMAGECONTROL ;
             Command = ".uno:ConvertToImageControl" ;
             Text [ en-US ] = "Ima~ge Control";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_FORMATTED ;
-            HelpID = SID_FM_CONVERTTO_FORMATTED ;
+            HelpId = CMD_SID_FM_CONVERTTO_FORMATTED ;
             Command = ".uno:ConvertToFormatted" ;
             Text [ en-US ] = "Fo~rmatted Field";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_SCROLLBAR ;
-            HelpID = SID_FM_CONVERTTO_SCROLLBAR ;
+            HelpId = CMD_SID_FM_CONVERTTO_SCROLLBAR ;
             Command = ".uno:ConvertToScrollBar" ;
             Text [ en-US ] = "Scroll bar";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_SPINBUTTON;
-            HelpID = SID_FM_CONVERTTO_SPINBUTTON;
+            HelpId = CMD_SID_FM_CONVERTTO_SPINBUTTON;
             Command = ".uno:ConvertToSpinButton" ;
             Text [ en-US ] = "Spin Button";
         };
         MenuItem
         {
             Identifier = SID_FM_CONVERTTO_NAVIGATIONBAR;
-            HelpID = SID_FM_CONVERTTO_NAVIGATIONBAR;
+            HelpId = CMD_SID_FM_CONVERTTO_NAVIGATIONBAR;
             Command = ".uno:ConvertToNavigationBar" ;
             Text [ en-US ] = "Navigation Bar" ;
         };
@@ -304,6 +307,7 @@ ImageList RID_SVXIMGLIST_FMEXPL_HC
 
 ModalDialog RID_SVXDLG_SETFORM
 {
+    HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 200 , 200 ) ;
@@ -342,6 +346,7 @@ ModalDialog RID_SVXDLG_SETFORM
 };
 DockingWindow RID_SVX_FMEXPLORER
 {
+    HelpID = "svx:DockingWindow:RID_SVX_FMEXPLORER";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 200 , 200 ) ;
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
index 65171bd07646..287f60a277a7 100644
--- a/svx/source/form/formshell.src
+++ b/svx/source/form/formshell.src
@@ -31,6 +31,7 @@
 #include <sfx2/sfxsids.hrc>
 #include "globlmn.hrc"
 #include "helpid.hrc"
+#include "fmhelp.hrc"
 
 Menu RID_FM_TEXTATTRIBUTE_MENU
 {
@@ -47,7 +48,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
         MenuItem
         {
             Identifier = MENU_FM_TEXTATTRIBITES_STYLE;
-            HelpID = MENU_FM_TEXTATTRIBITES_STYLE;
+            HelpID = HID_MENU_FM_TEXTATTRIBUTES_STYLE;
             Text [ en-US ] = "St~yle";
             SubMenu = Menu
             {
@@ -96,7 +97,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
         MenuItem
         {
             Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT;
-            HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT;
+            HelpID = HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT;
             Text [ en-US ] = "~Alignment";
             RadioCheck = TRUE;
             SubMenu = Menu
@@ -129,7 +130,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU
         MenuItem
         {
             Identifier = MENU_FM_TEXTATTRIBITES_SPACING;
-            HelpID = MENU_FM_TEXTATTRIBITES_SPACING;
+            HelpID = HID_MENU_FM_TEXTATTRIBUTES_SPACING;
             Text [ en-US ] = "~Line Spacing";
             _MenuItemFlags = MIB_RADIOCHECK;
             SubMenu = Menu