CWS gnumake: resync to m91; conflicts unresolved

1 files changed, 40 insertions, 0 deletions

diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 4243ba1b6c68..79300699bd33 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -98,6 +98,7 @@ TabPage TP_FORMAT_TABLE
     };
     Edit ED_NAME
     {
+        HelpID = "sw:Edit:TP_FORMAT_TABLE:ED_NAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 14 ) ;
         Size = MAP_APPFONT ( 112 , 12 ) ;
@@ -111,6 +112,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_WIDTH
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 30 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -129,6 +131,7 @@ TabPage TP_FORMAT_TABLE
     };
     CheckBox CB_REL_WIDTH
     {
+        HelpID = "sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH";
         Pos = MAP_APPFONT ( 118 , 32 ) ;
         Size = MAP_APPFONT ( 69 , 10 ) ;
         TabStop = TRUE ;
@@ -142,6 +145,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_FULL
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FULL";
         Pos = MAP_APPFONT ( 202 , 14 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -149,6 +153,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_LEFT
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT";
         Pos = MAP_APPFONT ( 202 , 28 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "~Left" ;
@@ -156,6 +161,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_FROM_LEFT
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT";
         Pos = MAP_APPFONT ( 202 , 42 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -163,6 +169,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_RIGHT
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT";
         Pos = MAP_APPFONT ( 202 , 56 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "R~ight" ;
@@ -170,6 +177,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_CENTER
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER";
         Pos = MAP_APPFONT ( 202 , 70 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "~Center" ;
@@ -177,6 +185,7 @@ TabPage TP_FORMAT_TABLE
     };
     RadioButton RB_FREE
     {
+        HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FREE";
         Pos = MAP_APPFONT ( 202 , 84 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         TabStop = TRUE ;
@@ -202,6 +211,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_LEFT_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST";
         Pos = MAP_APPFONT ( 147 , 59 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -226,6 +236,7 @@ TabPage TP_FORMAT_TABLE
 
     MetricField ED_RIGHT_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST";
         Pos = MAP_APPFONT ( 147 , 75 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -249,6 +260,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_TOP_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST";
         Pos = MAP_APPFONT ( 147 , 91 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Border = TRUE ;
@@ -272,6 +284,7 @@ TabPage TP_FORMAT_TABLE
     };
     MetricField ED_BOTTOM_DIST
     {
+        HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 147 , 107 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -303,6 +316,7 @@ TabPage TP_FORMAT_TABLE
     };
     ListBox     LB_TEXTDIRECTION
     {
+        HelpID = "sw:ListBox:TP_FORMAT_TABLE:LB_TEXTDIRECTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 75 , 136 ) ;
         Size = MAP_APPFONT ( 176 , 50 ) ;
@@ -329,6 +343,7 @@ TabPage TP_TABLE_COLUMN
     Hide = TRUE;
     CheckBox CB_MOD_TBL
     {
+        HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL";
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         TabStop = TRUE ;
@@ -336,6 +351,7 @@ TabPage TP_TABLE_COLUMN
     };
     CheckBox CB_PROP
     {
+        HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_PROP";
         Pos = MAP_APPFONT ( 6 , 20 ) ;
         Size = MAP_APPFONT ( 180 , 10 ) ;
         TabStop = TRUE ;
@@ -349,6 +365,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField ED_SPACE
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:ED_SPACE";
         ReadOnly = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 95 , 34 ) ;
@@ -365,6 +382,7 @@ TabPage TP_TABLE_COLUMN
     };
     ImageButton COL_BTN_DOWN
     {
+        HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 12 , 65 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
@@ -373,6 +391,7 @@ TabPage TP_TABLE_COLUMN
     };
     ImageButton COL_BTN_UP
     {
+        HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP";
         Disable = TRUE ;
         Pos = MAP_APPFONT ( 234 , 65 ) ;
         Size = MAP_APPFONT ( 10 , 10 ) ;
@@ -391,6 +410,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_1
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_1";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 13 , 81 ) ;
@@ -418,6 +438,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_2
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_2";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 52 , 81 ) ;
@@ -445,6 +466,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_3
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_3";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 91 , 81 ) ;
@@ -472,6 +494,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_4
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_4";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 130 , 81 ) ;
@@ -499,6 +522,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_5
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_5";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 169 , 81 ) ;
@@ -526,6 +550,7 @@ TabPage TP_TABLE_COLUMN
     };
     MetricField COL_MF_6
     {
+        HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_6";
         Disable = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 208 , 81 ) ;
@@ -568,6 +593,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_PAGEBREAK
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGEBREAK";
          //         Disable = TRUE;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 90 , 8 ) ;
@@ -577,6 +603,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_BREAKPAGE
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKPAGE";
         Pos = MAP_APPFONT ( 105 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Page" ;
@@ -585,6 +612,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_BREAKCOLUMN
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN";
          //         Disable = TRUE;
         Pos = MAP_APPFONT ( 178 , 14 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -593,6 +621,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_PAGEBREAKBEFORE
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE";
          //         Disable = TRUE;
         Pos = MAP_APPFONT ( 105 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -602,6 +631,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     RadioButton RB_PAGEBREAKAFTER
     {
+        HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER";
          //         Disable = TRUE;
         Pos = MAP_APPFONT ( 178 , 28 ) ;
         Size = MAP_APPFONT ( 70 , 10 ) ;
@@ -609,6 +639,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_PAGECOLL
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGECOLL";
          //         Disable = TRUE;
         Pos = MAP_APPFONT ( 12 , 44 ) ;
         Size = MAP_APPFONT ( 90 , 10 ) ;
@@ -618,6 +649,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     ListBox LB_PAGECOLL
     {
+        HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_PAGECOLL";
         Pos = MAP_APPFONT ( 105 , 42 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
         TabStop = TRUE ;
@@ -631,6 +663,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     NumericField NF_PAGENUM
     {
+        HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_PAGENUM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 222 , 42 ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -646,6 +679,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_SPLIT
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_SPLIT";
         Pos = MAP_APPFONT ( 12 , 58 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -653,6 +687,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     TriStateBox CB_SPLIT_ROW
     {
+        HelpID = "sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW";
         Pos = MAP_APPFONT ( 21 , 71 ) ;
         Size = MAP_APPFONT ( 227 , 10 ) ;
         TabStop = TRUE ;
@@ -660,6 +695,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_KEEP
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_KEEP";
         Pos = MAP_APPFONT ( 12 , 85 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~Keep with next paragraph" ;
@@ -667,6 +703,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     CheckBox CB_HEADLINE
     {
+        HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_HEADLINE";
         Pos = MAP_APPFONT ( 12 , 99 ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -680,6 +717,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     NumericField NF_REPEAT_HEADER
     {
+        HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 131 , 113 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
@@ -704,6 +742,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     ListBox LB_TEXTDIRECTION
     {
+        HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION";
         Pos = MAP_APPFONT ( 85 , 130 ) ;
         Size = MAP_APPFONT ( 163 , 50 ) ;
         DropDown = TRUE;
@@ -730,6 +769,7 @@ TabPage TP_TABLE_TEXTFLOW
     };
     ListBox LB_VERTORIENT
     {
+        HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT";
         Pos = MAP_APPFONT ( 85 , 162 ) ;
         Size = MAP_APPFONT ( 61 , 50 ) ;
         DropDown = TRUE;