CWS gnumake: resync to m91; conflicts unresolved

8 files changed, 117 insertions, 8 deletions

diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src
index ae0693205b87..5ad5a4b9d6a4 100644
--- a/sw/source/ui/envelp/envfmt.src
+++ b/sw/source/ui/envelp/envfmt.src
@@ -57,6 +57,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_ADDR_LEFT
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_ADDR_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 25 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -81,6 +82,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_ADDR_TOP
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_ADDR_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 41 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -105,6 +107,7 @@ TabPage TP_ENV_FMT
     };
     MenuButton BTN_ADDR_EDIT
     {
+        HelpID = "sw:MenuButton:TP_ENV_FMT:BTN_ADDR_EDIT";
         Pos = MAP_APPFONT ( 194 , 24 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -132,6 +135,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SEND_LEFT
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SEND_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 78 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -156,6 +160,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SEND_TOP
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SEND_TOP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 94 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -180,6 +185,7 @@ TabPage TP_ENV_FMT
     };
     MenuButton BTN_SEND_EDIT
     {
+        HelpID = "sw:MenuButton:TP_ENV_FMT:BTN_SEND_EDIT";
         Pos = MAP_APPFONT ( 194 , 77 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Edit" ;
@@ -200,6 +206,7 @@ TabPage TP_ENV_FMT
     };
     ListBox BOX_SIZE_FORMAT
     {
+        HelpID = "sw:ListBox:TP_ENV_FMT:BOX_SIZE_FORMAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 120 ) ;
         Size = MAP_APPFONT ( 40 , 72 ) ;
@@ -215,6 +222,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SIZE_WIDTH
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SIZE_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 136 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -239,6 +247,7 @@ TabPage TP_ENV_FMT
     };
     MetricField FLD_SIZE_HEIGHT
     {
+        HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SIZE_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 152 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index 298e5cb7611e..436f4bd27df6 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -51,7 +51,7 @@
 
 #include <unomid.h>
 
-#ifdef WIN
+#ifdef WNT
 #define NEXTLINE  UniString::CreateFromAscii("\r\n")
 #else
 #define NEXTLINE  '\n'
diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src
index c85b6cd1a7ab..2b9a5a084cc8 100644
--- a/sw/source/ui/envelp/envlop.src
+++ b/sw/source/ui/envelp/envlop.src
@@ -86,6 +86,7 @@ TabPage TP_ENV_ENV
     };
     MultiLineEdit EDT_ADDR
     {
+        HelpID = "sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 17 ) ;
         Size = MAP_APPFONT ( 124 , 66 ) ;
@@ -103,6 +104,7 @@ TabPage TP_ENV_ENV
     };
     ListBox LB_DATABASE
     {
+        HelpID = "sw:ListBox:TP_ENV_ENV:LB_DATABASE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 162 , 17 ) ;
         Size = MAP_APPFONT ( 82 , 50 ) ;
@@ -117,6 +119,7 @@ TabPage TP_ENV_ENV
     };
     ListBox LB_TABLE
     {
+        HelpID = "sw:ListBox:TP_ENV_ENV:LB_TABLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 162 , 44 ) ;
         Size = MAP_APPFONT ( 82 , 50 ) ;
@@ -125,6 +128,7 @@ TabPage TP_ENV_ENV
     };
     ImageButton BTN_INSERT
     {
+        HelpID = "sw:ImageButton:TP_ENV_ENV:BTN_INSERT";
         Pos = MAP_APPFONT ( 137 , 71 ) ;
         Size = MAP_APPFONT ( 18 , 12 ) ;
         SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
@@ -138,6 +142,7 @@ TabPage TP_ENV_ENV
     };
     ListBox LB_DBFIELD
     {
+        HelpID = "sw:ListBox:TP_ENV_ENV:LB_DBFIELD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 162 , 71 ) ;
         Size = MAP_APPFONT ( 82 , 50 ) ;
@@ -146,6 +151,7 @@ TabPage TP_ENV_ENV
     };
     CheckBox BOX_SEND
     {
+        HelpID = "sw:CheckBox:TP_ENV_ENV:BOX_SEND";
         Pos = MAP_APPFONT ( 6 , 105 ) ;
         Size = MAP_APPFONT ( 124 , 8 ) ;
         Text [ en-US ] = "~Sender" ;
@@ -153,6 +159,7 @@ TabPage TP_ENV_ENV
     };
     MultiLineEdit EDT_SEND
     {
+        HelpID = "sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 116) ;
         Size = MAP_APPFONT ( 124 , 63 ) ;
diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src
index f671c9506dc6..a12db0d166f9 100644
--- a/sw/source/ui/envelp/envprt.src
+++ b/sw/source/ui/envelp/envprt.src
@@ -49,37 +49,38 @@ TabPage TP_ENV_PRT
             ToolBoxItem
             {
                 Identifier = ITM_HOR_LEFT ;
-                HelpID = ITM_HOR_LEFT ;
+                HelpID = HID_ITM_HOR_LEFT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_HOR_CNTR ;
-                HelpID = ITM_HOR_CNTR ;
+                HelpID = HID_ITM_HOR_CNTR ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_HOR_RGHT ;
-                HelpID = ITM_HOR_RGHT ;
+                HelpID = HID_ITM_HOR_RGHT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_LEFT ;
-                HelpID = ITM_VER_LEFT ;
+                HelpID = HID_ITM_VER_LEFT ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_CNTR ;
-                HelpID = ITM_VER_CNTR ;
+                HelpID = HID_ITM_VER_CNTR ;
             };
             ToolBoxItem
             {
                 Identifier = ITM_VER_RGHT ;
-                HelpID = ITM_VER_RGHT ;
+                HelpID = HID_ITM_VER_RGHT ;
             };
         };
     };
     RadioButton BTN_TOP
     {
+        HelpID = "sw:RadioButton:TP_ENV_PRT:BTN_TOP";
         Pos = MAP_APPFONT ( 18 , 42 ) ;
         Size = MAP_APPFONT ( 179 , 10 ) ;
         Text [ en-US ] = "~Print from top" ;
@@ -89,6 +90,7 @@ TabPage TP_ENV_PRT
     };
     RadioButton BTN_BOTTOM
     {
+        HelpID = "sw:RadioButton:TP_ENV_PRT:BTN_BOTTOM";
         Pos = MAP_APPFONT ( 18 , 56 ) ;
         Size = MAP_APPFONT ( 179 , 10 ) ;
         Text [ en-US ] = "Print from ~bottom" ;
@@ -103,6 +105,7 @@ TabPage TP_ENV_PRT
     };
     MetricField FLD_RIGHT
     {
+        HelpID = "sw:MetricField:TP_ENV_PRT:FLD_RIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 86 , 72 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -127,6 +130,7 @@ TabPage TP_ENV_PRT
     };
     MetricField FLD_DOWN
     {
+        HelpID = "sw:MetricField:TP_ENV_PRT:FLD_DOWN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 86 , 88 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -157,6 +161,7 @@ TabPage TP_ENV_PRT
     };
     PushButton BTN_PRTSETUP
     {
+        HelpID = "sw:PushButton:TP_ENV_PRT:BTN_PRTSETUP";
         Pos = MAP_APPFONT ( 198 , 114 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index 40d9560deee7..bd5be722ce46 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -110,6 +110,7 @@ TabPage TP_LAB_LAB
     };
     CheckBox BOX_ADDR
     {
+        HelpID = "sw:CheckBox:TP_LAB_LAB:BOX_ADDR";
         Pos = MAP_APPFONT ( 67 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -117,6 +118,7 @@ TabPage TP_LAB_LAB
     };
     MultiLineEdit EDT_WRITING
     {
+        HelpID = "sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 105 , 89 ) ;
@@ -134,6 +136,7 @@ TabPage TP_LAB_LAB
     };
     ListBox LB_DATABASE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:LB_DATABASE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 149 , 27 ) ;
         Size = MAP_APPFONT ( 99 , 70 ) ;
@@ -148,6 +151,7 @@ TabPage TP_LAB_LAB
     };
     ListBox LB_TABLE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:LB_TABLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 149 , 56 ) ;
         Size = MAP_APPFONT ( 99 , 70 ) ;
@@ -156,6 +160,7 @@ TabPage TP_LAB_LAB
     };
     ImageButton BTN_INSERT
     {
+        HelpID = "sw:ImageButton:TP_LAB_LAB:BTN_INSERT";
         Pos = MAP_APPFONT ( 124 , 92 ) ;
         Size = MAP_APPFONT ( 18 , 12 ) ;
         SYMBOL = IMAGEBUTTON_ARROW_LEFT ;
@@ -169,6 +174,7 @@ TabPage TP_LAB_LAB
     };
     ListBox LB_DBFIELD
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:LB_DBFIELD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 149 , 92 ) ;
         Size = MAP_APPFONT ( 99 , 70 ) ;
@@ -184,6 +190,7 @@ TabPage TP_LAB_LAB
     };
     RadioButton BTN_CONT
     {
+        HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_CONT";
         Pos = MAP_APPFONT ( 12 , 137 ) ;
         Size = MAP_APPFONT ( 65 , 10 ) ;
         TabStop = TRUE ;
@@ -192,6 +199,7 @@ TabPage TP_LAB_LAB
     };
     RadioButton BTN_SHEET
     {
+        HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_SHEET";
         Pos = MAP_APPFONT ( 12 , 153 ) ;
         Size = MAP_APPFONT ( 65 , 10 ) ;
         Text [ en-US ] = "~Sheet" ;
@@ -205,6 +213,7 @@ TabPage TP_LAB_LAB
     };
     ListBox BOX_MAKE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:BOX_MAKE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 136 ) ;
         Size = MAP_APPFONT ( 124 , 90 ) ;
@@ -220,6 +229,7 @@ TabPage TP_LAB_LAB
     };
     ListBox BOX_TYPE
     {
+        HelpID = "sw:ListBox:TP_LAB_LAB:BOX_TYPE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 152 ) ;
         Size = MAP_APPFONT ( 124 , 90 ) ;
@@ -255,6 +265,7 @@ FloatingWindow DLG_SYNC_BTN
     Hide = TRUE ;
     PushButton BTN_SYNC
     {
+        HelpID = "sw:PushButton:DLG_SYNC_BTN:BTN_SYNC";
         Pos = MAP_APPFONT ( 1 , 1 ) ;
         Size = MAP_APPFONT ( WIDTH - 1 , HEIGHT - 1 ) ;
         Text [ en-US ] = "Synchronize Labels" ;
@@ -291,6 +302,7 @@ TabPage TP_VISITING_CARDS
     };
     ListBox LB_AUTO_TEXT_GROUP
     {
+        HelpID = "sw:ListBox:TP_VISITING_CARDS:LB_AUTO_TEXT_GROUP";
         Pos = MAP_APPFONT ( 12 , 164) ;
         Size = MAP_APPFONT ( 109 , 50 ) ;
         Border = TRUE ;
@@ -332,18 +344,21 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_FIRSTNAME
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME";
         Pos = MAP_APPFONT ( 105 , 14 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME";
         Pos = MAP_APPFONT ( 163 , 14 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_SHORTCUT
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT";
         Pos = MAP_APPFONT ( 221 , 14 ) ;
         Size = MAP_APPFONT ( 27 , 12 ) ;
         Border = TRUE ;
@@ -356,18 +371,21 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_FIRSTNAME_2
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME_2";
         Pos = MAP_APPFONT ( 105 , 30 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_NAME_2
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME_2";
         Pos = MAP_APPFONT ( 163 , 30 ) ;
         Size = MAP_APPFONT ( 55 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_SHORTCUT_2
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT_2";
         Pos = MAP_APPFONT ( 221 , 30 ) ;
         Size = MAP_APPFONT ( 27 , 12 ) ;
         Border = TRUE ;
@@ -380,6 +398,7 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_STREET
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STREET";
         Pos = MAP_APPFONT ( 105 , 46 ) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -392,12 +411,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_ZIP
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_ZIP";
         Pos = MAP_APPFONT ( 105 , 62 ) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_CITY
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_CITY";
         Pos = MAP_APPFONT ( 158 , 62 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
         Border = TRUE ;
@@ -410,12 +431,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_COUNTRY
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY";
         Pos = MAP_APPFONT ( 105 , 78 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_STATE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STATE";
         Pos = MAP_APPFONT ( 179 , 78 ) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -428,12 +451,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_TITLE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_TITLE";
         Pos = MAP_APPFONT ( 105 , 94 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_PROFESSION
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION";
         Pos = MAP_APPFONT ( 179 , 94 ) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -446,12 +471,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_PHONE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PHONE";
         Pos = MAP_APPFONT ( 105 , 110 ) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MOBILE
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MOBILE";
         Pos = MAP_APPFONT ( 179 , 110 ) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -464,6 +491,7 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_FAX
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FAX";
         Pos = MAP_APPFONT ( 105 , 126 ) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -476,12 +504,14 @@ TabPage TP_PRIVATE_DATA
     };
     Edit ED_WWW
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_WWW";
         Pos = MAP_APPFONT ( 105 , 142) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MAIL
     {
+        HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MAIL";
         Pos = MAP_APPFONT ( 179 , 142) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -506,6 +536,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_COMP
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP";
         Pos = MAP_APPFONT ( 105 , 14) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -518,6 +549,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_COMP_EXT
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT";
         Pos = MAP_APPFONT ( 105 , 30) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -530,6 +562,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_SLOGAN
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN";
         Pos = MAP_APPFONT ( 105 , 46) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -542,6 +575,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_STREET
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STREET";
         Pos = MAP_APPFONT ( 105 , 62) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -554,12 +588,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_ZIP
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_ZIP";
         Pos = MAP_APPFONT ( 105 , 78) ;
         Size = MAP_APPFONT ( 50 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_CITY
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_CITY";
         Pos = MAP_APPFONT ( 158 , 78) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
         Border = TRUE ;
@@ -572,12 +608,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_COUNTRY
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY";
         Pos = MAP_APPFONT ( 105 , 94) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_STATE
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STATE";
         Pos = MAP_APPFONT ( 179 , 94) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -590,6 +628,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_POSITION
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_POSITION";
         Pos = MAP_APPFONT ( 105 , 110) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -602,12 +641,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_PHONE
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_PHONE";
         Pos = MAP_APPFONT ( 105 , 126) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MOBILE
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MOBILE";
         Pos = MAP_APPFONT ( 179 , 126) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
@@ -620,6 +661,7 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_FAX
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_FAX";
         Pos = MAP_APPFONT ( 105 , 142) ;
         Size = MAP_APPFONT ( 143 , 12 ) ;
         Border = TRUE ;
@@ -632,12 +674,14 @@ TabPage TP_BUSINESS_DATA
     };
     Edit ED_WWW
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_WWW";
         Pos = MAP_APPFONT ( 105 , 158) ;
         Size = MAP_APPFONT ( 71 , 12 ) ;
         Border = TRUE ;
     };
     Edit ED_MAIL
     {
+        HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MAIL";
         Pos = MAP_APPFONT ( 179 , 158) ;
         Size = MAP_APPFONT ( 69 , 12 ) ;
         Border = TRUE ;
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 890df1220250..58605e3db43d 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -61,6 +61,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_HDIST
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 17 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -81,6 +82,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_VDIST
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_VDIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 33 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -101,6 +103,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_WIDTH
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 49 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -121,6 +124,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_HEIGHT
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HEIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 65 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -141,6 +145,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_LEFT
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_LEFT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 81 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -163,6 +168,7 @@ TabPage TP_LAB_FMT
     };
     MetricField FLD_UPPER
     {
+        HelpID = "sw:MetricField:TP_LAB_FMT:FLD_UPPER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 97 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -185,6 +191,7 @@ TabPage TP_LAB_FMT
     };
     NumericField FLD_COLUMNS
     {
+        HelpID = "sw:NumericField:TP_LAB_FMT:FLD_COLUMNS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 113 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -204,6 +211,7 @@ TabPage TP_LAB_FMT
     };
     NumericField FLD_ROWS
     {
+        HelpID = "sw:NumericField:TP_LAB_FMT:FLD_ROWS";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 129 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -216,6 +224,7 @@ TabPage TP_LAB_FMT
     };
     PushButton  PB_SAVE
     {
+        HelpID = "sw:PushButton:TP_LAB_FMT:PB_SAVE";
         Pos = MAP_APPFONT ( 50 , 148 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Save...";
@@ -270,6 +279,7 @@ ModalDialog DLG_SAVE_LABEL
     };
     ComboBox CB_MAKE
     {
+        HelpID = "sw:ComboBox:DLG_SAVE_LABEL:CB_MAKE";
         Pos = MAP_APPFONT ( 65 , 15 ) ;
         Size = MAP_APPFONT ( 100 , 50 ) ;
         Border = TRUE;
@@ -284,6 +294,7 @@ ModalDialog DLG_SAVE_LABEL
     };
     Edit ED_TYPE
     {
+        HelpID = "sw:Edit:DLG_SAVE_LABEL:ED_TYPE";
         Pos = MAP_APPFONT ( 65 , 30 ) ;
         Size = MAP_APPFONT ( 100 , 12 ) ;
         Border = TRUE;
diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src
index 6ace6002d7f6..2a8b4e537bd0 100644
--- a/sw/source/ui/envelp/labprt.src
+++ b/sw/source/ui/envelp/labprt.src
@@ -37,6 +37,7 @@ TabPage TP_LAB_PRT
     Hide = TRUE ;
     RadioButton BTN_PAGE
     {
+        HelpID = "sw:RadioButton:TP_LAB_PRT:BTN_PAGE";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         TabStop = TRUE ;
@@ -45,6 +46,7 @@ TabPage TP_LAB_PRT
     };
     RadioButton BTN_SINGLE
     {
+        HelpID = "sw:RadioButton:TP_LAB_PRT:BTN_SINGLE";
         Pos = MAP_APPFONT ( 12 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Single label" ;
@@ -58,6 +60,7 @@ TabPage TP_LAB_PRT
     };
     NumericField FLD_COL
     {
+        HelpID = "sw:NumericField:TP_LAB_PRT:FLD_COL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 160 , 27 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -77,6 +80,7 @@ TabPage TP_LAB_PRT
     };
     NumericField FLD_ROW
     {
+        HelpID = "sw:NumericField:TP_LAB_PRT:FLD_ROW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 224 , 27 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -89,6 +93,7 @@ TabPage TP_LAB_PRT
     };
     CheckBox CB_SYNCHRON
     {
+        HelpID = "sw:CheckBox:TP_LAB_PRT:CB_SYNCHRON";
         Pos = MAP_APPFONT ( 12 , 43 ) ;
         Size = MAP_APPFONT ( 120 , 10 ) ;
         TabStop = TRUE ;
@@ -109,6 +114,7 @@ TabPage TP_LAB_PRT
     };
     PushButton BTN_PRTSETUP
     {
+        HelpID = "sw:PushButton:TP_LAB_PRT:BTN_PRTSETUP";
         Pos = MAP_APPFONT ( 198 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src
index ec6888e2c0e1..a19c36458366 100644
--- a/sw/source/ui/envelp/mailmrge.src
+++ b/sw/source/ui/envelp/mailmrge.src
@@ -41,7 +41,7 @@ ModalDialog DLG_MAILMERGE
     _MAIL_MERGE_STRING_
     Moveable = TRUE ;
     Sizeable = TRUE;
-    HelpID = FN_QRY_MERGE ;
+    HelpID = CMD_FN_QRY_MERGE ;
     Window WIN_BEAMER
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -49,6 +49,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_ALL
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_ALL";
         Pos = MAP_APPFONT ( 12 , 97 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~All" ;
@@ -56,6 +57,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_MARKED
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MARKED";
         Pos = MAP_APPFONT ( 12 , 110 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         Text [ en-US ] = "~Selected records" ;
@@ -63,6 +65,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_FROM
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FROM";
         Pos = MAP_APPFONT ( 12 , 123 ) ;
         Size = MAP_APPFONT ( 33 , 10 ) ;
         Text [ en-US ] = "~From:" ;
@@ -70,6 +73,7 @@ ModalDialog DLG_MAILMERGE
     };
     NumericField NF_FROM
     {
+        HelpID = "sw:NumericField:DLG_MAILMERGE:NF_FROM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 48 , 122 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -87,6 +91,7 @@ ModalDialog DLG_MAILMERGE
     };
     NumericField NF_TO
     {
+        HelpID = "sw:NumericField:DLG_MAILMERGE:NF_TO";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 105 , 122 ) ;
         Size = MAP_APPFONT ( 24 , 12 ) ;
@@ -103,6 +108,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_PRINTER
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_PRINTER";
         Pos = MAP_APPFONT ( 144 , 97 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         Check = TRUE ;
@@ -111,6 +117,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_MAILING
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MAILING";
         Pos = MAP_APPFONT ( 200 , 97 ) ;
         Size = MAP_APPFONT ( 53 , 10 ) ;
         TabStop = TRUE ;
@@ -118,6 +125,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_FILE
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FILE";
         Pos = MAP_APPFONT ( 256 , 97 ) ;
         Size = MAP_APPFONT ( 56 , 10 ) ;
         TabStop = TRUE ;
@@ -125,6 +133,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_SINGLE_JOBS
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS";
         Pos = MAP_APPFONT ( 150 , 112 ) ;
         Size = MAP_APPFONT ( 142 , 10 ) ;
         TabStop = TRUE ;
@@ -138,6 +147,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_SAVE_SINGLE_DOC
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_SINGLE_DOC";
         Pos = MAP_APPFONT (  150, 139 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         TabStop = TRUE ;
@@ -145,6 +155,7 @@ ModalDialog DLG_MAILMERGE
     };
     RadioButton RB_SAVE_INDIVIDUAL
     {
+        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_INDIVIDUAL";
         Pos = MAP_APPFONT (  150, 152 ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         TabStop = TRUE ;
@@ -152,6 +163,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox RB_GENERATE_FROM_DATABASE
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:RB_GENERATE_FROM_DATABASE";
         Pos = MAP_APPFONT (  156, 168 ) ;
         Size = MAP_APPFONT ( 144 , 10 ) ;
         TabStop = TRUE ;
@@ -165,6 +177,7 @@ ModalDialog DLG_MAILMERGE
     };
     ListBox LB_COLUMN
     {
+        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_COLUMN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 205 , 182 ) ;
         Size = MAP_APPFONT ( 103 , 84 ) ;
@@ -179,6 +192,7 @@ ModalDialog DLG_MAILMERGE
     };
     Edit ED_PATH
     {
+        HelpID = "sw:Edit:DLG_MAILMERGE:ED_PATH";
         Pos = MAP_APPFONT ( 205 , 198 ) ;
         Size = MAP_APPFONT ( 86 , 12 ) ;
         Border = TRUE ;
@@ -186,6 +200,7 @@ ModalDialog DLG_MAILMERGE
     };
     PushButton PB_PATH
     {
+        HelpID = "sw:PushButton:DLG_MAILMERGE:PB_PATH";
         Pos = MAP_APPFONT ( 294 , 198 ) ;
         Size = MAP_APPFONT ( 14 , 12 ) ;
          // Soll Groesse des Edits haben (12)!
@@ -200,6 +215,7 @@ ModalDialog DLG_MAILMERGE
     };
     ListBox LB_FILTER
     {
+        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_FILTER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 205 , 214 ) ;
         Size = MAP_APPFONT ( 103 , 84 ) ;
@@ -209,6 +225,7 @@ ModalDialog DLG_MAILMERGE
     };
     ListBox LB_ADDRESSFLD
     {
+        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_ADDRESSFLD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 220 , 110 ) ;
         Size = MAP_APPFONT ( 74 , 84 ) ;
@@ -226,6 +243,7 @@ ModalDialog DLG_MAILMERGE
     };
     Edit ED_SUBJECT
     {
+        HelpID = "sw:Edit:DLG_MAILMERGE:ED_SUBJECT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 220 , 127 ) ;
         Size = MAP_APPFONT ( 88 , 12 ) ;
@@ -241,6 +259,7 @@ ModalDialog DLG_MAILMERGE
     };
     Edit ED_ATTACH
     {
+        HelpID = "sw:Edit:DLG_MAILMERGE:ED_ATTACH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 220 , 140 ) ;
         Size = MAP_APPFONT ( 72 , 12 ) ;
@@ -250,6 +269,7 @@ ModalDialog DLG_MAILMERGE
     };
     PushButton PB_ATTACH
     {
+        HelpID = "sw:PushButton:DLG_MAILMERGE:PB_ATTACH";
         Pos = MAP_APPFONT ( 294 , 140 ) ;
         Size = MAP_APPFONT ( 14 , 12 ) ;
          // Soll Groesse des Edits haben (12)!
@@ -266,6 +286,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_FORMAT_HTML
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_HTML";
         Pos = MAP_APPFONT ( 220 , 156 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Disable = TRUE ;
@@ -275,6 +296,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_FORMAT_RTF
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF";
         Pos = MAP_APPFONT ( 220 , 169 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Disable = TRUE ;
@@ -283,6 +305,7 @@ ModalDialog DLG_MAILMERGE
     };
     CheckBox CB_FORMAT_SW
     {
+        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW";
         Pos = MAP_APPFONT ( 220, 182 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         Disable = TRUE ;
@@ -340,6 +363,7 @@ ModalDialog DLG_MERGE_CREATE
     };
     RadioButton RB_THISDOC
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_CREATE:RB_THISDOC";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Check = TRUE;
@@ -348,6 +372,7 @@ ModalDialog DLG_MERGE_CREATE
     };
     RadioButton RB_TEMPLATE
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_CREATE:RB_TEMPLATE";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         TabStop = TRUE ;
@@ -387,6 +412,7 @@ ModalDialog DLG_MERGE_FIELD_CONNECTIONS
     };
     RadioButton RB_USEEXISTING
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_USEEXISTING";
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         Check = TRUE;
@@ -395,6 +421,7 @@ ModalDialog DLG_MERGE_FIELD_CONNECTIONS
     };
     RadioButton RB_CREATENEW
     {
+        HelpID = "sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_CREATENEW";
         Pos = MAP_APPFONT ( 12 , 27 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
         TabStop = TRUE ;