sb131: merged in re/DEV300_next towards DEV300_m94

31 files changed, 129 insertions, 22 deletions

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 67930fc6f7a7..513d49b6aad8 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -241,7 +241,7 @@ SeriesHeader::SeriesHeader( Window * pParent ) :
     m_spSeriesName->EnableUpdateData( 4 * EDIT_UPDATEDATA_TIMEOUT ); // define is in vcl/edit.hxx
     m_spSeriesName->SetUpdateDataHdl( LINK( this, SeriesHeader, SeriesNameChanged ));
     m_spSeriesName->SetModifyHdl( LINK( this, SeriesHeader, SeriesNameEdited ));
-    m_spSeriesName->SetSmartHelpId( SmartId( HID_SCH_DATA_SERIES_LABEL ));
+    m_spSeriesName->SetHelpId( HID_SCH_DATA_SERIES_LABEL );
     Show();
 }
 
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.src b/chart2/source/controller/dialogs/dlg_ChartType.src
index 5523ad8956db..57e1f281a613 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.src
+++ b/chart2/source/controller/dialogs/dlg_ChartType.src
@@ -38,7 +38,7 @@
 
 ModalDialog DLG_DIAGRAM_TYPE
 {
-    HelpID = SID_DIAGRAM_TYPE ;
+    HelpID = HID_DIAGRAM_TYPE ;
 
     Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , CHART_TYPE_DLG_HEIGHT ) ;
 
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 5b82e57f7044..e7a7a8bd43d8 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -117,7 +117,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
 #endif
         , WZS_INVALID_STATE
     );
-    this->SetRoadmapSmartHelpId( SmartId( HID_SCH_WIZARD_ROADMAP ) );
+    this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP );
     this->SetRoadmapInteractive( sal_True );
     Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) );
     Size aSize( this->GetSizePixel() );
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src
index dadd1ac3098d..02ccc98b7a82 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.src
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.src
@@ -38,7 +38,7 @@
 
 ModalDialog DLG_DIAGRAM_DATA
 {
-    HelpID = SID_DIAGRAM_DATA ;
+    HelpID = HID_DIAGRAM_DATA ;
     OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index e97f15898064..0a250b5bf874 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -88,7 +88,7 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
     FreeResource();
     if(!bAxisDlg)
     {
-        SetHelpId( SID_INSERT_GRIDS );
+        SetHelpId( HID_INSERT_GRIDS );
         SetText( ObjectNameProvider::getName(OBJECTTYPE_GRID,true) );
 
         aCbPrimaryX.SetHelpId( HID_SCH_CB_XGRID );
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
index 11eec47d0996..0ee3f219c12c 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src
@@ -33,7 +33,7 @@
 
 ModalDialog DLG_AXIS_OR_GRID
 {
-    HelpID = SID_INSERT_AXIS ;
+    HelpID = HID_INSERT_AXIS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     //Size = MAP_APPFONT ( 160 , 99 ) ;
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src
index 8f8a64485778..24ae2f63fce1 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src
@@ -32,7 +32,7 @@
 
 ModalDialog DLG_DATA_DESCR
 {
-    HelpID = SID_INSERT_DESCRIPTION ;
+    HelpID = HID_INSERT_DESCRIPTION ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 316 , 185 ) ;
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
index 08230207b007..462c81211011 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
@@ -33,7 +33,7 @@
 
 ModalDialog DLG_DATA_YERRORBAR
 {
-//  HelpID = SID_INSERT_STATISTICS ;
+    HelpID = "chart2:ModalDialog:DLG_DATA_YERRORBAR";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 300 , 156 ) ;
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src
index 95a1d5516ab5..1f768f7c065b 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.src
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.src
@@ -36,7 +36,7 @@
 
 ModalDialog DLG_LEGEND
 {
-    HelpID = SID_INSERT_CHART_LEGEND ;
+    HelpID = HID_INSERT_CHART_LEGEND ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 156 , 80 ) ;
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.src b/chart2/source/controller/dialogs/dlg_InsertTitle.src
index f84ff2c6acd7..446763e93b9e 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.src
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.src
@@ -32,7 +32,7 @@
 
 ModalDialog DLG_TITLE
 {
-    HelpID = SID_INSERT_TITLE ;
+    HelpID = HID_INSERT_TITLE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 220 , 156 ) ;
diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src
index 54c490d4a2d1..e7abd803fd87 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src
+++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src
@@ -37,7 +37,7 @@
 
 ModalDialog DLG_DATA_TRENDLINE
 {
-    HelpID = SID_INSERT_STATISTICS ;
+    HelpID = HID_INSERT_STATISTICS ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES, 172 );
diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src
index 5b1802ecfb3d..7be2dd60b324 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.src
+++ b/chart2/source/controller/dialogs/dlg_View3D.src
@@ -28,10 +28,11 @@
 #include "dlg_View3D.hrc"
 #include "SchSlotIds.hxx"
 #include "CommonResources.hrc"
+#include "HelpIds.hrc"
 
 TabDialog DLG_3D_VIEW
 {
-    HelpID = SID_3D_VIEW ;
+    HelpID = HID_3D_VIEW ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
diff --git a/chart2/source/controller/dialogs/hidother.src b/chart2/source/controller/dialogs/hidother.src
index 4b006f0f1f93..195115e93bd1 100644
--- a/chart2/source/controller/dialogs/hidother.src
+++ b/chart2/source/controller/dialogs/hidother.src
@@ -25,9 +25,6 @@
  *
  ************************************************************************/
 #include "HelpIds.hrc"
-#include "SchSlotIds.hxx"
-
-hidspecial SID_INSERT_GRIDS {HelpId= SID_INSERT_GRIDS; };
 
 hidspecial HID_SCH_CB_XAXIS {HelpId= HID_SCH_CB_XAXIS; };
 hidspecial HID_SCH_CB_YAXIS {HelpId= HID_SCH_CB_YAXIS; };
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
index df202410109d..47e43e8c45b3 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
@@ -51,6 +51,7 @@
 
 TabPage TP_3D_SCENEAPPEARANCE
 {
+    HelpID = "chart2:TabPage:TP_3D_SCENEAPPEARANCE";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
@@ -64,6 +65,7 @@ TabPage TP_3D_SCENEAPPEARANCE
     };
     ListBox LB_SCHEME
     {
+        HelpID = "chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME";
         Border = TRUE;
         TabStop = TRUE;
         DropDown = TRUE;
@@ -78,12 +80,14 @@ TabPage TP_3D_SCENEAPPEARANCE
 
     CheckBox CB_SHADING
     {
+        HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING";
         Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SHADING ) ;
         Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ;
         Text [ en-US ] = "~Shading" ;
     };
     CheckBox CB_OBJECTLINES
     {
+        HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES";
         Pos = MAP_APPFONT ( POS_X_1 , POS_Y_OBJECTLINES ) ;
         Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ;
         Text [ en-US ] = "~Object borders" ;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
index 329eb25e0e51..733212e6652a 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
@@ -28,6 +28,7 @@
 #include "tp_3D_SceneGeometry.hrc"
 #include "dlg_View3D.hrc"
 #include "SchSlotIds.hxx"
+#include "HelpIds.hrc"
 
 #ifndef _SVT_CONTROLDIMS_HRC_
 #include <svtools/controldims.hrc>
@@ -68,7 +69,7 @@ CustomUnitText [ en-US ] = " degrees" ;
 
 TabPage TP_3D_SCENEGEOMETRY
 {
-    HelpID = SID_3D_VIEW ;
+    HelpID = HID_3D_VIEW ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
@@ -76,6 +77,7 @@ TabPage TP_3D_SCENEGEOMETRY
 
     CheckBox CBX_RIGHT_ANGLED_AXES
     {
+        HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_RIGHT_ANGLED_AXES";
         Pos = MAP_APPFONT ( POS_X_1 , POS_Y_0  ) ;
         Size = MAP_APPFONT ( (WIDTH_FT+WIDTH_MF) , HEIGHT_FT ) ;
         TabStop = TRUE ;
@@ -101,18 +103,21 @@ TabPage TP_3D_SCENEGEOMETRY
     };
     MetricField MTR_FLD_X_ROTATION
     {
+        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION";
         Pos = MAP_APPFONT ( POS_X_2 , POS_Y_1-2  ) ;
         Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
         CUSTOMUNITTEXT_DEGREE
     };
     MetricField MTR_FLD_Y_ROTATION
     {
+        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION";
         Pos = MAP_APPFONT ( POS_X_2 , POS_Y_2-2  ) ;
         Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
         CUSTOMUNITTEXT_DEGREE
     };
     MetricField MTR_FLD_Z_ROTATION
     {
+        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION";
         Pos = MAP_APPFONT ( POS_X_2 , POS_Y_3-2 ) ;
         Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
         CUSTOMUNITTEXT_DEGREE
@@ -120,6 +125,7 @@ TabPage TP_3D_SCENEGEOMETRY
 
     CheckBox CBX_PERSPECTIVE
     {
+        HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_PERSPECTIVE";
         Pos = MAP_APPFONT ( POS_X_1 , POS_Y_4  ) ;
         Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ;
         TabStop = TRUE ;
@@ -127,6 +133,7 @@ TabPage TP_3D_SCENEGEOMETRY
     };
     MetricField MTR_FLD_PERSPECTIVE
     {
+        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_PERSPECTIVE";
         Pos = MAP_APPFONT ( POS_X_2 , POS_Y_4-2  ) ;
         Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
         Border = TRUE ;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src
index 57f15a1894d7..0b052f4d00c6 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src
@@ -59,6 +59,7 @@
 
 TabPage TP_3D_SCENEILLUMINATION
 {
+    HelpID = "chart2:TabPage:TP_3D_SCENEILLUMINATION";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Hide = TRUE ;
@@ -72,46 +73,55 @@ TabPage TP_3D_SCENEILLUMINATION
     };
     ImageButton BTN_LIGHT_1
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1";
         Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_BUTTONS ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ImageButton BTN_LIGHT_2
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_2";
         Pos = MAP_APPFONT ( POS_X_0+BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ImageButton BTN_LIGHT_3
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_3";
         Pos = MAP_APPFONT ( POS_X_0+2*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ImageButton BTN_LIGHT_4
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_4";
         Pos = MAP_APPFONT ( POS_X_0+3*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ImageButton BTN_LIGHT_5
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_5";
         Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ImageButton BTN_LIGHT_6
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_6";
         Pos = MAP_APPFONT ( POS_X_0+1*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ImageButton BTN_LIGHT_7
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_7";
         Pos = MAP_APPFONT ( POS_X_0+2*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ImageButton BTN_LIGHT_8
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_8";
         Pos = MAP_APPFONT ( POS_X_0+3*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
     };
     ListBox LB_LIGHTSOURCE
     {
+        HelpID = "chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_LIGHTSOURCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE ) ;
         Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ;
@@ -120,6 +130,7 @@ TabPage TP_3D_SCENEILLUMINATION
     };
     ImageButton BTN_LIGHTSOURCE_COLOR
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHTSOURCE_COLOR";
         Pos = MAP_APPFONT ( POS_X_1 , POS_Y_LIGHTSOURCE ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
         TabStop = TRUE ;
@@ -136,6 +147,7 @@ TabPage TP_3D_SCENEILLUMINATION
     };
     ListBox LB_AMBIENTLIGHT
     {
+        HelpID = "chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_AMBIENTLIGHT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( POS_X_0 , POS_Y_AMBIENT ) ;
         Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ;
@@ -144,6 +156,7 @@ TabPage TP_3D_SCENEILLUMINATION
     };
     ImageButton BTN_AMBIENT_COLOR
     {
+        HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_AMBIENT_COLOR";
         Pos = MAP_APPFONT ( POS_X_1 , POS_Y_AMBIENT ) ;
         Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ;
         TabStop = TRUE ;
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src
index bcba1926c242..75da7dc5e653 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.src
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.src
@@ -35,6 +35,7 @@ TabPage TP_AXIS_LABEL
 
     CheckBox CB_AXIS_LABEL_SCHOW_DESCR
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR";
         Pos = MAP_APPFONT ( 6 , 6  ) ;
         Size    = MAP_APPFONT ( 248 , 12 ) ;
 
@@ -112,6 +113,7 @@ TabPage TP_AXIS_LABEL
     };
         CheckBox CB_AXIS_LABEL_TEXTOVERLAP
         {
+            HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP";
             Pos = MAP_APPFONT ( 139 , 33  ) ;
             Size = MAP_APPFONT ( 115 , 10 ) ;
             TabStop = TRUE ;
@@ -120,6 +122,7 @@ TabPage TP_AXIS_LABEL
     };
         CheckBox CB_AXIS_LABEL_TEXTBREAK
         {
+            HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK";
             Pos = MAP_APPFONT ( 139 , 47  ) ;
             Size = MAP_APPFONT ( 115 , 10 ) ;
             TabStop = TRUE ;
@@ -137,6 +140,7 @@ TabPage TP_AXIS_LABEL
     };
         RadioButton RB_AXIS_LABEL_SIDEBYSIDE
         {
+            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE";
             Pos = MAP_APPFONT ( 12 , 33  ) ;
             Size = MAP_APPFONT ( 112 , 10 ) ;
             TabStop = TRUE ;
@@ -145,6 +149,7 @@ TabPage TP_AXIS_LABEL
     };
         RadioButton RB_AXIS_LABEL_UPDOWN
         {
+            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN";
             Pos = MAP_APPFONT ( 12 , 47  ) ;
             Size = MAP_APPFONT ( 112 , 10 ) ;
             TabStop = TRUE ;
@@ -153,6 +158,7 @@ TabPage TP_AXIS_LABEL
     };
         RadioButton RB_AXIS_LABEL_DOWNUP
         {
+            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP";
             Pos = MAP_APPFONT ( 12 , 61  ) ;
             Size = MAP_APPFONT ( 112 , 10 ) ;
             TabStop = TRUE ;
@@ -161,6 +167,7 @@ TabPage TP_AXIS_LABEL
     };
         RadioButton RB_AXIS_LABEL_AUTOORDER
         {
+            HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER";
             Pos = MAP_APPFONT ( 12 , 75  ) ;
             Size = MAP_APPFONT ( 112 , 10 ) ;
             TabStop = TRUE ;
@@ -176,6 +183,7 @@ TabPage TP_AXIS_LABEL
     };
     ListBox LB_AXIS_TEXTDIR
     {
+        HelpID = "chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR";
         Pos = MAP_APPFONT ( 78 , 154 ) ;
         Size = MAP_APPFONT ( 170 , 100 ) ;
         Border = TRUE;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src
index 8ce1ba39056a..1173b841354a 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.src
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.src
@@ -60,6 +60,7 @@
 
 TabPage TP_AXIS_POSITIONS
 {
+    HelpID = "chart2:TabPage:TP_AXIS_POSITIONS";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
@@ -79,6 +80,7 @@ TabPage TP_AXIS_POSITIONS
     };
     ListBox LB_CROSSES_OTHER_AXIS_AT
     {
+        HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT";
         Border = TRUE ;
         AutoHScroll = TRUE ;
         Pos = MAP_APPFONT ( X4 , Y1-2 ) ;
@@ -98,6 +100,7 @@ TabPage TP_AXIS_POSITIONS
     };
     SpinField EDT_CROSSES_OTHER_AXIS_AT
     {
+        HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( X5 , Y1-2  ) ;
@@ -106,6 +109,7 @@ TabPage TP_AXIS_POSITIONS
     };
     ComboBox EDT_CROSSES_OTHER_AXIS_AT_CATEGORY
     {
+        HelpID = "chart2:ComboBox:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT_CATEGORY";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( X5 , Y1-2  ) ;
@@ -116,6 +120,7 @@ TabPage TP_AXIS_POSITIONS
 
     CheckBox CB_AXIS_BETWEEN_CATEGORIES
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_AXIS_BETWEEN_CATEGORIES";
         Hide = TRUE;
         Pos = MAP_APPFONT ( X2 , Y2  ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -137,6 +142,7 @@ TabPage TP_AXIS_POSITIONS
     };
     ListBox LB_PLACE_LABELS
     {
+        HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_LABELS";
         Border = TRUE ;
         AutoHScroll = TRUE ;
         Pos = MAP_APPFONT ( X4 , Y4-2 ) ;
@@ -164,6 +170,7 @@ TabPage TP_AXIS_POSITIONS
     };
     SpinField EDT_AXIS_LABEL_DISTANCE
     {
+        HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_AXIS_LABEL_DISTANCE";
         Hide = TRUE;
         Border = TRUE ;
         SVLook = TRUE ;
@@ -186,12 +193,14 @@ TabPage TP_AXIS_POSITIONS
     };
     CheckBox CB_TICKS_INNER
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_INNER";
         Pos = MAP_APPFONT ( XTICK_2 , Y7  ) ;
         Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
         Text [ en-US ] = "~Inner";
     };
     CheckBox CB_TICKS_OUTER
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_OUTER";
         Pos = MAP_APPFONT ( XTICK_3 , Y7  ) ;
         Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
         Text [ en-US ] = "~Outer";
@@ -205,12 +214,14 @@ TabPage TP_AXIS_POSITIONS
     };
     CheckBox CB_MINOR_INNER
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_INNER";
         Pos = MAP_APPFONT ( XTICK_2 , Y8  );
         Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
         Text [ en-US ] = "I~nner";
     };
     CheckBox CB_MINOR_OUTER
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_OUTER";
         Pos = MAP_APPFONT ( XTICK_3 , Y8  ) ;
         Size = MAP_APPFONT ( TICKWIDTH , 10 ) ;
         Text [ en-US ] = "O~uter";
@@ -232,6 +243,7 @@ TabPage TP_AXIS_POSITIONS
     };
     ListBox LB_PLACE_TICKS
     {
+        HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_TICKS";
         Border = TRUE ;
         AutoHScroll = TRUE ;
         Pos = MAP_APPFONT ( X3 , Y9-2  ) ;
@@ -259,6 +271,7 @@ TabPage TP_AXIS_POSITIONS
     };
     CheckBox CB_MAJOR_GRID
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MAJOR_GRID";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( X2 , Y11  ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -267,6 +280,7 @@ TabPage TP_AXIS_POSITIONS
     };
     PushButton PB_MAJOR_GRID
     {
+        HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MAJOR_GRID";
         Hide = TRUE ;
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( X3 , Y11-2  );
@@ -275,6 +289,7 @@ TabPage TP_AXIS_POSITIONS
     };
     CheckBox CB_MINOR_GRID
     {
+        HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_GRID";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( X2 , Y12  ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
@@ -283,6 +298,7 @@ TabPage TP_AXIS_POSITIONS
     };
     PushButton PB_MINOR_GRID
     {
+        HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MINOR_GRID";
         Hide = TRUE ;
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( X3 , Y12-2  );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src
index a9bb2a039f3c..69c33cd14021 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.src
+++ b/chart2/source/controller/dialogs/tp_ChartType.src
@@ -69,7 +69,7 @@
 TabPage TP_CHARTTYPE
 {
     Hide = TRUE ;
-    HelpID = SID_DIAGRAM_TYPE;
+    HelpID = HID_DIAGRAM_TYPE;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ;
 
@@ -99,18 +99,21 @@ TabPage TP_CHARTTYPE
 
     CheckBox CB_X_AXIS_CATEGORIES
     {
+        HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES";
         Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_VALUE_X_AXIS ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "X axis with Categories" ;
     };
     CheckBox CB_3D_LOOK
     {
+        HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK";
         Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_3D_LOOK ) ;
         Size = MAP_APPFONT ( WIDTH_3D , 10 ) ;
         Text [ en-US ] = "~3D Look" ;
     };
     ListBox LB_3D_SCHEME
     {
+        HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME";
         Border = TRUE;
         TabStop = TRUE;
         DropDown = TRUE;
@@ -120,12 +123,14 @@ TabPage TP_CHARTTYPE
 
     CheckBox CB_STACKED
     {
+        HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_STACKED";
         Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_STACKING ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "~Stack series" ;
     };
     RadioButton RB_STACK_Y
     {
+        HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y";
         Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+12  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -135,6 +140,7 @@ TabPage TP_CHARTTYPE
     };
     RadioButton RB_STACK_Y_PERCENT
     {
+        HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT";
         Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+2*12  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -142,6 +148,7 @@ TabPage TP_CHARTTYPE
     };
     RadioButton RB_STACK_Z
     {
+        HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z";
         Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+3*12  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -152,6 +159,7 @@ TabPage TP_CHARTTYPE
 
     CheckBox CB_SPLINES
     {
+        HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES";
         Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ;
         Size = MAP_APPFONT ( 150 , 10 ) ;
         Text [ en-US ] = "S~mooth lines" ;
@@ -159,6 +167,7 @@ TabPage TP_CHARTTYPE
 
     PushButton PB_SPLINE_DIALOG
     {
+        HelpID = "chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES-6 ) ;
         Size = MAP_APPFONT ( 12 , 14 ) ;
@@ -167,6 +176,7 @@ TabPage TP_CHARTTYPE
 
     CheckBox CB_XVALUE_SORTING
     {
+        HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_XVALUE_SORTING";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_XVALUE_SORTING ) ;
         Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ;
@@ -185,6 +195,7 @@ ModalDialog DLG_SPLINE_PROPERTIES
     Closeable = TRUE;
     RadioButton RB_SPLINES_CUBIC
     {
+        HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC";
         Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_2  ) ;
         Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ;
         TabStop = TRUE ;
@@ -192,6 +203,7 @@ ModalDialog DLG_SPLINE_PROPERTIES
     };
     RadioButton RB_SPLINES_B
     {
+        HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B";
         Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_3  ) ;
         Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ;
         TabStop = TRUE ;
@@ -213,6 +225,7 @@ ModalDialog DLG_SPLINE_PROPERTIES
     };
     MetricField MF_SPLINE_RESOLUTION
     {
+        HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_2-2  ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
@@ -236,6 +249,7 @@ ModalDialog DLG_SPLINE_PROPERTIES
     };
     MetricField MF_SPLINE_ORDER
     {
+        HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER";
         Border = TRUE ;
         Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_3-2  ) ;
         Size = MAP_APPFONT ( 25 , 12 ) ;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 7c5f0fb3967b..70a478ea8c39 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -311,7 +311,7 @@ DataSourceTabPage::DataSourceTabPage(
     // set handlers
     m_apLB_SERIES->SetSelectHdl( LINK( this, DataSourceTabPage, SeriesSelectionChangedHdl ));
 
-    m_aLB_ROLE.SetWindowBits( WB_HSCROLL | WB_CLIPCHILDREN );
+    m_aLB_ROLE.SetStyle( m_aLB_ROLE.GetStyle() | WB_HSCROLL | WB_CLIPCHILDREN );
     m_aLB_ROLE.SetSelectionMode( SINGLE_SELECTION );
     m_aLB_ROLE.SetSelectHdl( LINK( this, DataSourceTabPage, RoleSelectionChangedHdl ));
 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.src b/chart2/source/controller/dialogs/tp_DataSource.src
index 3e1f8a51c68a..9173a9c709ab 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.src
+++ b/chart2/source/controller/dialogs/tp_DataSource.src
@@ -29,6 +29,7 @@
 
 TabPage TP_DATA_SOURCE
 {
+    HelpID = "chart2:TabPage:TP_DATA_SOURCE";
     Hide = TRUE;
     Size = MAP_APPFONT ( 248, 140 );
     SVLook = TRUE ;
@@ -86,6 +87,7 @@ TabPage TP_DATA_SOURCE
     };
     Edit EDT_RANGE
     {
+        HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_RANGE";
         Border = TRUE;
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 82 , 89  );
@@ -93,6 +95,7 @@ TabPage TP_DATA_SOURCE
     };
     ImageButton IMB_RANGE_MAIN
     {
+        HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_MAIN";
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 228 , 88  );
         Size = MAP_APPFONT ( 14 , 14 );
@@ -118,6 +121,7 @@ TabPage TP_DATA_SOURCE
 
     Edit EDT_CATEGORIES
     {
+        HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_CATEGORIES";
         Border = TRUE;
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 82 , 117  );
@@ -125,6 +129,7 @@ TabPage TP_DATA_SOURCE
     };
     ImageButton IMB_RANGE_CAT
     {
+        HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_CAT";
         TabStop = TRUE;
         Pos  = MAP_APPFONT ( 228 , 116  );
         Size = MAP_APPFONT ( 14 , 14 );
@@ -134,6 +139,7 @@ TabPage TP_DATA_SOURCE
 
     PushButton BTN_ADD
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_ADD";
         TabStop = TRUE;
         Disable = FALSE;
         Pos  = MAP_APPFONT ( 6 , 105  );
@@ -143,6 +149,7 @@ TabPage TP_DATA_SOURCE
     };
     PushButton BTN_REMOVE
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_REMOVE";
         TabStop = TRUE;
         Disable = TRUE;
         Pos  = MAP_APPFONT ( 6 , 121  );
@@ -154,6 +161,7 @@ TabPage TP_DATA_SOURCE
     // Note: Text is only a black triangle symbol
     PushButton BTN_UP
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_UP";
         TabStop = TRUE;
         Disable = TRUE;
         Pos  = MAP_APPFONT ( 64 , 105  );
@@ -163,6 +171,7 @@ TabPage TP_DATA_SOURCE
     // Note: Text is only a black triangle symbol
     PushButton BTN_DOWN
     {
+        HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_DOWN";
         TabStop = TRUE;
         Disable = TRUE;
         Pos  = MAP_APPFONT ( 64 , 121  );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src
index 03748914255f..b649cb4474c9 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.src
@@ -30,8 +30,8 @@
 
 TabPage TP_YERRORBAR
 {
+    HelpID = "chart2:TabPage:TP_YERRORBAR";
     Hide = TRUE ;
-//  HelpID = HID_SCH_STAT ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     RESOURCE_ERRORBARS( 260 - 12, 0 )
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src
index d910a5143293..1ac64330108a 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.src
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.src
@@ -56,6 +56,7 @@ TabPage TP_LEGEND_POS
     };
     ListBox LB_LEGEND_TEXTDIR
     {
+        HelpID = "chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR";
         Pos = MAP_APPFONT ( 78 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 17 ) ;
         Size = MAP_APPFONT ( 170 , 100 ) ;
         Border = TRUE;
diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src
index 6a921103f2e4..be0033d436dd 100644
--- a/chart2/source/controller/dialogs/tp_Location.src
+++ b/chart2/source/controller/dialogs/tp_Location.src
@@ -45,6 +45,7 @@
 
 TabPage TP_LOCATION
 {
+    HelpID = "chart2:TabPage:TP_LOCATION";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ;
@@ -65,6 +66,7 @@ TabPage TP_LOCATION
     };
     ListBox LB_TABLE
     {
+        HelpID = "chart2:ListBox:TP_LOCATION:LB_TABLE";
         Border = TRUE ;
         DropDown = TRUE ;
         Pos = MAP_APPFONT ( WIZ_POSX3 , WIZ_POSY2 ) ;
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src
index 54c591c0865d..b6862cba3b77 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.src
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.src
@@ -29,8 +29,8 @@
 
 TabPage TP_LAYOUT
 {
+    HelpID = "chart2:TabPage:TP_LAYOUT";
     Hide = TRUE ;
-//    HelpID = HID_LAYOUT ;
     SVLook = TRUE ;
     Size   = MAP_APPFONT ( 260 , 185 ) ;
 };
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src
index 237fa027b55f..96463a97341b 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.src
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.src
@@ -30,12 +30,14 @@
 
 TabPage TP_POLAROPTIONS
 {
+    HelpID = "chart2:TabPage:TP_POLAROPTIONS";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
 
     CheckBox CB_CLOCKWISE
     {
+        HelpID = "chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE";
         Pos = MAP_APPFONT ( 12 , 8  );
         Size = MAP_APPFONT ( 248 , 10 );
         TabStop = TRUE;
@@ -61,6 +63,7 @@ TabPage TP_POLAROPTIONS
     };
     NumericField NF_STARTING_ANGLE
     {
+        HelpID = "chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE";
         Pos = MAP_APPFONT ( 61 , 53 ) ;
         Size = MAP_APPFONT ( 28 , 12 ) ;
         Border = TRUE ;
@@ -79,6 +82,7 @@ TabPage TP_POLAROPTIONS
     };
     CheckBox CB_INCLUDE_HIDDEN_CELLS_POLAR
     {
+        HelpID = "chart2:CheckBox:TP_POLAROPTIONS:CB_INCLUDE_HIDDEN_CELLS_POLAR";
         Pos = MAP_APPFONT ( 12 , 104 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src
index de07c9763b7d..962722b41c71 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.src
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.src
@@ -37,6 +37,7 @@
 
 TabPage TP_RANGECHOOSER
 {
+    HelpID = "chart2:TabPage:TP_RANGECHOOSER";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 248, 140 ) ;
@@ -55,18 +56,21 @@ TabPage TP_RANGECHOOSER
     };
     Edit ED_RANGE
     {
+        HelpID = "chart2:Edit:TP_RANGECHOOSER:ED_RANGE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 32  ) ;
         Size = MAP_APPFONT ( 220 , 12 ) ;
     };
     ImageButton IB_RANGE
     {
+        HelpID = "chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE";
         Pos = MAP_APPFONT ( 228 , 31  ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         TabStop = FALSE ;
     };
     RadioButton RB_DATAROWS
     {
+        HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS";
         Pos = MAP_APPFONT ( 6 , 52  ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -74,6 +78,7 @@ TabPage TP_RANGECHOOSER
     };
     RadioButton RB_DATACOLS
     {
+        HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS";
         Pos = MAP_APPFONT ( 6 , 66  ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         TabStop = TRUE ;
@@ -81,12 +86,14 @@ TabPage TP_RANGECHOOSER
     };
     CheckBox CB_FIRST_ROW_ASLABELS
     {
+        HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS";
         Pos = MAP_APPFONT ( 6 , 84  ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "~First row as label" ;
     };
     CheckBox CB_FIRST_COLUMN_ASLABELS
     {
+        HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS";
         Pos = MAP_APPFONT ( 6 , 98  ) ;
         Size = MAP_APPFONT ( 236 , 10 ) ;
         Text [ en-US ] = "F~irst column as label" ;
diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src
index b53adeaa512f..9e92e70f6f43 100644
--- a/chart2/source/controller/dialogs/tp_Scale.src
+++ b/chart2/source/controller/dialogs/tp_Scale.src
@@ -46,6 +46,7 @@
 
 TabPage TP_SCALE
 {
+    HelpID = "chart2:TabPage:TP_SCALE";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
@@ -64,6 +65,7 @@ TabPage TP_SCALE
     };
     SpinField EDT_MIN
     {
+        HelpID = "chart2:SpinField:TP_SCALE:EDT_MIN";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( X3 , Y1-2 ) ;
@@ -72,6 +74,7 @@ TabPage TP_SCALE
     };
     CheckBox CBX_AUTO_MIN
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN";
         Pos = MAP_APPFONT ( X4 , Y1-1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
@@ -86,6 +89,7 @@ TabPage TP_SCALE
     };
     SpinField EDT_MAX
     {
+        HelpID = "chart2:SpinField:TP_SCALE:EDT_MAX";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( X3 , Y2-2  ) ;
@@ -94,6 +98,7 @@ TabPage TP_SCALE
     };
     CheckBox CBX_AUTO_MAX
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX";
         Pos = MAP_APPFONT ( X4 , Y2-1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
@@ -107,6 +112,7 @@ TabPage TP_SCALE
     };
     SpinField EDT_STEP_MAIN
     {
+        HelpID = "chart2:SpinField:TP_SCALE:EDT_STEP_MAIN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( X3 , Y3-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
@@ -114,6 +120,7 @@ TabPage TP_SCALE
     };
     CheckBox CBX_AUTO_STEP_MAIN
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN";
         Pos = MAP_APPFONT ( X4 , Y3-1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
@@ -127,6 +134,7 @@ TabPage TP_SCALE
     };
     MetricField MT_STEPHELP
     {
+        HelpID = "chart2:MetricField:TP_SCALE:MT_STEPHELP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( X3 , Y4-2  ) ;
         Size = MAP_APPFONT ( EDITWIDTH , 12 ) ;
@@ -143,6 +151,7 @@ TabPage TP_SCALE
     };
     CheckBox CBX_AUTO_STEP_HELP
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP";
         Pos = MAP_APPFONT ( X4 , Y4-1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
@@ -157,6 +166,7 @@ TabPage TP_SCALE
     };
     SpinField EDT_ORIGIN
     {
+        HelpID = "chart2:SpinField:TP_SCALE:EDT_ORIGIN";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( X3 , Y5-2  ) ;
@@ -165,6 +175,7 @@ TabPage TP_SCALE
     };
     CheckBox CBX_AUTO_ORIGIN
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN";
         Pos = MAP_APPFONT ( X4 , Y5-1  ) ;
         Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ;
         TabStop = TRUE ;
@@ -173,6 +184,7 @@ TabPage TP_SCALE
 
     CheckBox CBX_LOGARITHM
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_LOGARITHM";
         Pos = MAP_APPFONT ( X2 , Y6  ) ;
         Size = MAP_APPFONT ( 244 , 10 ) ;
         TabStop = TRUE ;
@@ -181,6 +193,7 @@ TabPage TP_SCALE
 
     CheckBox CBX_REVERSE
     {
+        HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE";
         Pos = MAP_APPFONT ( X2 , Y7  ) ;
         Size = MAP_APPFONT ( 244 , 10 ) ;
         TabStop = TRUE ;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index bc434be7ef07..844c81bd2e64 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
@@ -29,8 +29,8 @@
 
 TabPage TP_OPTIONS
 {
+    HelpID = "chart2:TabPage:TP_OPTIONS";
     Hide = TRUE ;
-//    HelpID = HID_LAYOUT ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     FixedLine 1
@@ -41,6 +41,7 @@ TabPage TP_OPTIONS
     };
     RadioButton RBT_OPT_AXIS_1
     {
+        HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1";
         Pos = MAP_APPFONT ( 12 , 20  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -48,6 +49,7 @@ TabPage TP_OPTIONS
     };
     RadioButton RBT_OPT_AXIS_2
     {
+        HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2";
         Pos = MAP_APPFONT ( 12 , 34  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -69,6 +71,7 @@ TabPage TP_OPTIONS
 
     MetricField MT_OVERLAP
     {
+        HelpID = "chart2:MetricField:TP_OPTIONS:MT_OVERLAP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 63 , 78 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -95,6 +98,7 @@ TabPage TP_OPTIONS
 
     MetricField MT_GAP
     {
+        HelpID = "chart2:MetricField:TP_OPTIONS:MT_GAP";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 63 , 62 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
@@ -114,6 +118,7 @@ TabPage TP_OPTIONS
 
     CheckBox CB_CONNECTOR
     {
+        HelpID = "chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR";
         Pos = MAP_APPFONT ( 12 , 97 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
@@ -122,6 +127,7 @@ TabPage TP_OPTIONS
 
     CheckBox CB_BARS_SIDE_BY_SIDE
     {
+        HelpID = "chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE";
         Pos = MAP_APPFONT ( 12 , 97 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
@@ -144,6 +150,7 @@ TabPage TP_OPTIONS
 
     RadioButton RB_DONT_PAINT
     {
+        HelpID = "chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT";
         Pos = MAP_APPFONT ( 82 , 127  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -152,6 +159,7 @@ TabPage TP_OPTIONS
 
     RadioButton RB_ASSUME_ZERO
     {
+        HelpID = "chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO";
         Pos = MAP_APPFONT ( 82 , 141  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -160,6 +168,7 @@ TabPage TP_OPTIONS
 
     RadioButton RB_CONTINUE_LINE
     {
+        HelpID = "chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE";
         Pos = MAP_APPFONT ( 82 , 155  ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         TabStop = TRUE ;
@@ -168,6 +177,7 @@ TabPage TP_OPTIONS
 
     CheckBox CB_INCLUDE_HIDDEN_CELLS
     {
+        HelpID = "chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS";
         Pos = MAP_APPFONT ( 12 , 172 ) ;
         Size = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src
index efa11d3e2d67..1a283844a8d1 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.src
+++ b/chart2/source/controller/dialogs/tp_Trendline.src
@@ -30,8 +30,8 @@
 
 TabPage TP_TRENDLINE
 {
+    HelpID = "chart2:TabPage:TP_TRENDLINE";
     Hide = TRUE ;
-//  HelpID = HID_SCH_STAT ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 185 ) ;
     RESOURCE_TRENDLINE( 260 - 12, 0 )
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
index a17f5655e751..473007f1c32b 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src
@@ -59,6 +59,7 @@
 
 TabPage TP_WIZARD_TITLEANDOBJECTS
 {
+    HelpID = "chart2:TabPage:TP_WIZARD_TITLEANDOBJECTS";
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ;