CWS gnumake: resync to m91; conflicts unresolved

1 files changed, 21 insertions, 0 deletions

diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src
index 28e045a3a235..fbbf6785527c 100644
--- a/sw/source/ui/dbui/dbinsdlg.src
+++ b/sw/source/ui/dbui/dbinsdlg.src
@@ -46,6 +46,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_AS_TABLE
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE";
         Pos = MAP_APPFONT ( 80 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         TabStop = TRUE ;
@@ -54,6 +55,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_AS_FIELD
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD";
         Pos = MAP_APPFONT ( 145 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         TabStop = TRUE ;
@@ -61,6 +63,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_AS_TEXT
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT";
         Pos = MAP_APPFONT ( 210 , 6 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         TabStop = TRUE ;
@@ -106,6 +109,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_DBFMT_FROM_DB
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB";
         Pos = MAP_APPFONT ( 15 , 128 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         TabStop = TRUE ;
@@ -114,12 +118,14 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_DBFMT_FROM_USR
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR";
         Pos = MAP_APPFONT ( 15 , 143 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
         TabStop = TRUE ;
     };
     ListBox LB_DBFMT_FROM_USR
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 30 , 142 ) ;
         Size = MAP_APPFONT ( 75 , 44 ) ;
@@ -130,6 +136,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     /* -------------- Page Text / Fields -------------------------------- */
     ListBox LB_TXT_DB_COLUMN
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 93 , 70 ) ;
@@ -138,6 +145,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_TOEDIT
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT";
         Pos = MAP_APPFONT ( 111 , 41 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -153,6 +161,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     MultiLineEdit ED_DB_TEXT
     {
+        HelpID = "sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 137 , 41 ) ;
         Size = MAP_APPFONT ( 142 , 70 ) ;
@@ -172,6 +181,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ListBox LB_DB_PARA_COLL
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 182 , 127 ) ;
         Size = MAP_APPFONT ( 97 , 59 ) ;
@@ -183,6 +193,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     /* -------------- Page Table ---------------------------------------- */
     ListBox LB_TBL_DB_COLUMN
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 41 ) ;
         Size = MAP_APPFONT ( 93 , 70 ) ;
@@ -190,6 +201,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ALL_TO
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO";
         Pos = MAP_APPFONT ( 111 , 41 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -204,6 +216,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ONE_TO
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO";
         Pos = MAP_APPFONT ( 111 , 56 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -218,6 +231,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ONE_FROM
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM";
         Pos = MAP_APPFONT ( 111 , 84 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -232,6 +246,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ImageButton IB_DBCOL_ALL_FROM
     {
+        HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM";
         Pos = MAP_APPFONT ( 111 , 99 ) ;
         Size = MAP_APPFONT ( 20 , 12 ) ;
         TabStop = TRUE ;
@@ -253,6 +268,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     ListBox LB_TABLE_COL
     {
+        HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 137 , 41 ) ;
         Size = MAP_APPFONT ( 75 , 70 ) ;
@@ -265,6 +281,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     CheckBox CB_TABLE_HEADON
     {
+        HelpID = "sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON";
         Pos = MAP_APPFONT ( 111 , 128 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         TabStop = TRUE ;
@@ -273,6 +290,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_HEADL_COLNMS
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS";
         Pos = MAP_APPFONT ( 120 , 142 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         TabStop = TRUE ;
@@ -281,6 +299,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     RadioButton RB_HEADL_EMPTY
     {
+        HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY";
         Pos = MAP_APPFONT ( 120 , 155 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
         TabStop = TRUE ;
@@ -288,6 +307,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     PushButton PB_TBL_FORMAT
     {
+        HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT";
         Pos = MAP_APPFONT ( 214 , 128 ) ;
         Size = MAP_APPFONT ( 65 , 12 ) ;
         Text [ en-US ] = "Pr~operties..." ;
@@ -295,6 +315,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL
     };
     PushButton PB_TBL_AUTOFMT
     {
+        HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT";
         Pos = MAP_APPFONT ( 214 , 144 ) ;
         Size = MAP_APPFONT ( 65 , 12 ) ;
         TabStop = TRUE ;