sb131: merged in re/DEV300_next towards DEV300_m94

33 files changed, 254 insertions, 167 deletions

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index da92f145a..bc5320527 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 07a2627be..ba9a2476b 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 ecc78aca5..47e7faf73 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 002ff099f..62d29ae9f 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 9465103e1..09d34f337 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 2d93de1ee..41dc4f35e 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 a34dacde7..3669eeb22 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 8cf0f6b35..5e9ce92d7 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 4ee97fb3d..ad8f66936 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 10a1bfb69..4b047feb2 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 56b4697dd..7be436635 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 4c7177b1d..e3111ca74 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 657c25a8a..764c0612b 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 2f8dad3bc..d7280db71 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 54a4bcaf9..252e1c856 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 4262ad600..6dfdffdaf 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 a999ab7a4..c2e6ad225 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 80a42f55c..87e85af44 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 639553e53..ac2ccbe76 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 ac867040a..79796414a 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 da0a98caf..f2b4d4abb 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 6d8efc041..ff0424a71 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 cddd3f830..c57bce61d 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 4fbac61b4..4815b1cbc 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 d13667324..2c1606db3 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 f752f9483..7a548ea1c 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 69d6562cf..234242903 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 7ff88bfc6..f4cc592f3 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 134df3e9c..1864e0c01 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 16c7eff17..4b36472f1 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 41fa87c91..9d5d248dd 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 ) ;
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 244b3d71d..6f2062b91 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -27,156 +27,136 @@
 #ifndef CHART_HELPIDS_HRC
 #define CHART_HELPIDS_HRC
 
-#include <svl/solar.hrc>
-//next is 120
-//free: 20, 21, 22, 30, 31, 32, 33
+#define HID_SCH_ALIGNMENT                                   "CHART2_HID_SCH_ALIGNMENT"
+#define HID_SCH_LEGEND_POS                                  "CHART2_HID_SCH_LEGEND_POS"
+#define HID_SCH_DATA_DESCR                                  "CHART2_HID_SCH_DATA_DESCR"
 
-//see old chart: schhids.h
+#define HID_SCH_STAT                                        "CHART2_HID_SCH_STAT"
+#define HID_SCH_WIN_DOCUMENT                                "CHART2_HID_SCH_WIN_DOCUMENT"
+#define HID_SCH_CTL_DATA                                    "CHART2_HID_SCH_CTL_DATA"
 
-/*
-#define HID_SCH_DATA_ROW            (HID_SCH_START + 0)
-#define HID_SCH_DATA_LINE           (HID_SCH_START + 1)
-#define HID_SCH_DATA_POINT          (HID_SCH_START + 2)
-#define HID_SCH_DIAGRAM_X_AXIS      (HID_SCH_START + 3)
-*/
-#define HID_SCH_ALIGNMENT           (HID_SCH_START + 4)
-#define HID_SCH_LEGEND_POS          (HID_SCH_START + 5)
-#define HID_SCH_DATA_DESCR          (HID_SCH_START + 6)
-
-#define HID_SCH_STAT                (HID_SCH_START + 8)
-#define HID_SCH_WIN_DOCUMENT        (HID_SCH_START + 9)
-#define HID_SCH_CTL_DATA            (HID_SCH_START + 10)
-
-#define HID_SCH_CT_INDICATE         (HID_SCH_START + 11)
-// #define HID_SCH_CT_REGRESS          (HID_SCH_START + 12)
+#define HID_SCH_CT_INDICATE                                 "CHART2_HID_SCH_CT_INDICATE"
 
 //for chart type dialog:
-#define HID_SCH_CTL_TYPE            (HID_SCH_START + 13)
-#define HID_SCH_CTL_VARIANT         (HID_SCH_START + 14)
-#define HID_SCH_NUM_OF_LINES        (HID_SCH_START + 43)
-#define HID_SCH_SERIES_LIST         (HID_SCH_START + 15)
-#define HID_SCH_DATA_RANGES_LIST    (HID_SCH_START + 16)
+#define HID_SCH_CTL_TYPE                                    "CHART2_HID_SCH_CTL_TYPE"
+#define HID_SCH_CTL_VARIANT                                 "CHART2_HID_SCH_CTL_VARIANT"
+#define HID_SCH_NUM_OF_LINES                                "CHART2_HID_SCH_NUM_OF_LINES"
+#define HID_SCH_SERIES_LIST                                 "CHART2_HID_SCH_SERIES_LIST"
+#define HID_SCH_DATA_RANGES_LIST                            "CHART2_HID_SCH_DATA_RANGES_LIST"
 //
 
-//#define HID_SCH_CTL_LIGHT           (HID_SCH_START + 17)
-//#define HID_SCH_CT_INDICATE2        (HID_SCH_START + 18)
-//#define HID_SCH_CT_REGRESS2         (HID_SCH_START + 19)
-
-#define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23)
-#define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24)
-#define HID_SCH_TBI_DATA_DELETE_ROW (HID_SCH_START + 25)
-#define HID_SCH_TBI_DATA_DELETE_COL (HID_SCH_START + 26)
-#define HID_SCH_TBI_DATA_SWAP_COL   (HID_SCH_START + 27)
-#define HID_SCH_TBI_DATA_SWAP_ROW   (HID_SCH_START + 28)
-#define HID_SCH_TBI_DATA_INSERT_TEXT_COL   (HID_SCH_START + 29)
-#define HID_SCH_TBX_DATA            (HID_SCH_START + 34)
-
-#define HID_SCH_ALIGNMENT_CTR_DIAL  (HID_SCH_START + 35)
-#define HID_SCH_ALIGNMENT_STACKED   (HID_SCH_START + 36)
-#define HID_SCH_ALIGNMENT_DEGREES   (HID_SCH_START + 37)
-/*
-#define HID_SCH_LAYOUT				(HID_SCH_START + 38)
-
-#define HID_SCH_TBX_EDIT_FIELD		(HID_SCH_START + 39)
-#define HID_SCH_DIAGRAM_Y_AXIS      (HID_SCH_START + 40)//war mal 3
-
-#define HID_SCH_DEF_COLOR			(HID_SCH_START + 41)
-*/
-#define HID_SCH_TP_AXIS_LABEL		(HID_SCH_START + 42)
-
-#define HID_SCH_CHART_AUTO_FORMAT   (HID_SCH_START + 44)
-#define HID_SCH_LB_BAR_GEOMETRY     (HID_SCH_START + 45)
-#define HID_SCH_DLG_SPLINE_PROPERTIES    (HID_SCH_START + 46)
-#define HID_SCH_DLG_RANGES          (HID_SCH_START + 47)
-
-#define HID_SCH_CB_XAXIS          (HID_SCH_START + 48)
-#define HID_SCH_CB_YAXIS          (HID_SCH_START + 49)
-#define HID_SCH_CB_ZAXIS          (HID_SCH_START + 50)
-#define HID_SCH_CB_SECONDARY_XAXIS          (HID_SCH_START + 51)
-#define HID_SCH_CB_SECONDARY_YAXIS          (HID_SCH_START + 52)
-#define HID_SCH_CB_SECONDARY_ZAXIS          (HID_SCH_START + 53)
-
-#define HID_SCH_CB_XGRID          (HID_SCH_START + 54)
-#define HID_SCH_CB_YGRID          (HID_SCH_START + 55)
-#define HID_SCH_CB_ZGRID          (HID_SCH_START + 56)
-#define HID_SCH_CB_SECONDARY_XGRID          (HID_SCH_START + 57)
-#define HID_SCH_CB_SECONDARY_YGRID          (HID_SCH_START + 58)
-#define HID_SCH_CB_SECONDARY_ZGRID          (HID_SCH_START + 59)
-
-#define HID_SCH_LEGEND_POS_LEFT     (HID_SCH_START + 60)
-#define HID_SCH_LEGEND_POS_TOP      (HID_SCH_START + 61)
-#define HID_SCH_LEGEND_POS_RIGHT    (HID_SCH_START + 62)
-#define HID_SCH_LEGEND_POS_BOTTOM   (HID_SCH_START + 63)
-
-#define HID_SCH_STATISTIK_MEANVALUE         (HID_SCH_START + 64)
-#define HID_SCH_STATISTIK_NO_ERROR          (HID_SCH_START + 65)
-#define HID_SCH_STATISTIK_VARIANT           (HID_SCH_START + 66)
-#define HID_SCH_STATISTIK_SIGMA             (HID_SCH_START + 67)
-#define HID_SCH_STATISTIK_PERCENT           (HID_SCH_START + 68)
-#define HID_SCH_STATISTIK_BIGERROR          (HID_SCH_START + 69)
-#define HID_SCH_STATISTIK_CONSTERROR        (HID_SCH_START + 70)
-#define HID_SCH_STATISTIK_PERCENT_VALUE     (HID_SCH_START + 71)
-#define HID_SCH_STATISTIK_BIGERROR_VALUE    (HID_SCH_START + 72)
-#define HID_SCH_STATISTIK_PLUS_VALUE        (HID_SCH_START + 73)
-#define HID_SCH_STATISTIK_MINUS_VALUE       (HID_SCH_START + 74)
-
-#define HID_SCH_DATALABEL_VALUE     (HID_SCH_START + 75)
-#define HID_SCH_DATALABEL_NUMBER    (HID_SCH_START + 76)
-#define HID_SCH_DATALABEL_PERCENT   (HID_SCH_START + 77)
-#define HID_SCH_DATALABEL_TEXT      (HID_SCH_START + 78)
-#define HID_SCH_DATALABEL_SYMBOL    (HID_SCH_START + 79)
-#define HID_SCH_PB_NUMBERFORMAT     (HID_SCH_START + 88)
-#define HID_SCH_PB_PERCENT_NUMBERFORMAT     (HID_SCH_START + 89)
-#define HID_SCH_DATALABEL_SEPARATOR         (HID_SCH_START + 90)
-#define HID_SCH_DATALABEL_PLACEMENT         (HID_SCH_START + 91)
-#define HID_SCH_TEXTDIRECTION               (HID_SCH_START + 115)
-#define HID_SCH_TEXTDIRECTION_TITLE         (HID_SCH_START + 116)
-#define HID_SCH_TEXTDIRECTION_EQUATION      (HID_SCH_START + 117)
-#define HID_SCH_DATALABEL_ROTATION_KNOB     (HID_SCH_START + 118)
-#define HID_SCH_DATALABEL_ROTATION_EDIT     (HID_SCH_START + 119)
-
-#define HID_SCH_TITLE_MAIN  (HID_SCH_START + 80)
-#define HID_SCH_TITLE_SUB   (HID_SCH_START + 81)
-#define HID_SCH_TITLE_X     (HID_SCH_START + 82)
-#define HID_SCH_TITLE_Y     (HID_SCH_START + 83)
-#define HID_SCH_TITLE_Z     (HID_SCH_START + 84)
-#define HID_SCH_TITLE_SECONDARY_X     (HID_SCH_START + 92)
-#define HID_SCH_TITLE_SECONDARY_Y     (HID_SCH_START + 93)
-
-#define HID_SCH_WIZARD_ROADMAP     (HID_SCH_START + 85)
-#define HID_SCH_LEGEND_SHOW        (HID_SCH_START + 86)
-#define HID_SCH_DATA_SERIES_LABEL  (HID_SCH_START + 87)
-
-#define HID_SCH_STARTING_ANGLE_DIAL (HID_SCH_START + 94)
-
-#define HID_SCH_TRENDLINE_RB_NONE         (HID_SCH_START +  95)
-#define HID_SCH_TRENDLINE_RB_LINEAR       (HID_SCH_START +  96)
-#define HID_SCH_TRENDLINE_RB_LOGARITHMIC  (HID_SCH_START +  97)
-#define HID_SCH_TRENDLINE_RB_EXPONENTIAL  (HID_SCH_START +  98)
-#define HID_SCH_TRENDLINE_RB_POWER        (HID_SCH_START +  99)
-#define HID_SCH_TRENDLINE_SHOW_EQUATION   (HID_SCH_START + 100)
-#define HID_SCH_TRENDLINE_SHOW_R_SQUARED  (HID_SCH_START + 101)
-
-#define HID_SCH_STATISTIK_FUNCTION                  (HID_SCH_START + 102)
-#define HID_SCH_STATISTIK_RANGE                     (HID_SCH_START + 103)
-#define HID_SCH_STATISTIK_FUNCTION_LB               (HID_SCH_START + 104)
-#define HID_SCH_STATISTIK_POSITIVE_VALUE            (HID_SCH_START + 105)
-#define HID_SCH_STATISTIK_POSITIVE_RANGE            (HID_SCH_START + 106)
-#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER    (HID_SCH_START + 107)
-#define HID_SCH_STATISTIK_NEGATIVE_VALUE            (HID_SCH_START + 108)
-#define HID_SCH_STATISTIK_NEGATIVE_RANGE            (HID_SCH_START + 109)
-#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER    (HID_SCH_START + 110)
-#define HID_SCH_STATISTIK_SAME_FOR_BOTH             (HID_SCH_START + 111)
-#define HID_SCH_STATISTIK_SHOW_BOTH                 (HID_SCH_START + 112)
-#define HID_SCH_STATISTIK_SHOW_POSITIVE             (HID_SCH_START + 113)
-#define HID_SCH_STATISTIK_SHOW_NEGATIVE             (HID_SCH_START + 114)
-
-
-// HID_SCH_START should be 63280 (checked 25.Nov 2002)
-
-// 453 == SCH_IF_CHARTVIEWSHELL, da SFX_INTERFACE_LIB kein
-// Define sondern neuerdings ein Enum ist
-//#define HID_SCH_VIEWSHELL_DOCUMENT	(453)
+#define HID_SCH_TBI_DATA_INSERT_ROW                         "CHART2_HID_SCH_TBI_DATA_INSERT_ROW"
+#define HID_SCH_TBI_DATA_INSERT_COL                         "CHART2_HID_SCH_TBI_DATA_INSERT_COL"
+#define HID_SCH_TBI_DATA_DELETE_ROW                         "CHART2_HID_SCH_TBI_DATA_DELETE_ROW"
+#define HID_SCH_TBI_DATA_DELETE_COL                         "CHART2_HID_SCH_TBI_DATA_DELETE_COL"
+#define HID_SCH_TBI_DATA_SWAP_COL                           "CHART2_HID_SCH_TBI_DATA_SWAP_COL"
+#define HID_SCH_TBI_DATA_SWAP_ROW                           "CHART2_HID_SCH_TBI_DATA_SWAP_ROW"
+#define HID_SCH_TBI_DATA_INSERT_TEXT_COL                    "CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL"
+#define HID_SCH_TBX_DATA                                    "CHART2_HID_SCH_TBX_DATA"
+
+#define HID_SCH_ALIGNMENT_CTR_DIAL                          "CHART2_HID_SCH_ALIGNMENT_CTR_DIAL"
+#define HID_SCH_ALIGNMENT_STACKED                           "CHART2_HID_SCH_ALIGNMENT_STACKED"
+#define HID_SCH_ALIGNMENT_DEGREES                           "CHART2_HID_SCH_ALIGNMENT_DEGREES"
+
+#define HID_SCH_TP_AXIS_LABEL                               "CHART2_HID_SCH_TP_AXIS_LABEL"
+
+#define HID_SCH_CHART_AUTO_FORMAT                           "CHART2_HID_SCH_CHART_AUTO_FORMAT"
+#define HID_SCH_LB_BAR_GEOMETRY                             "CHART2_HID_SCH_LB_BAR_GEOMETRY"
+#define HID_SCH_DLG_SPLINE_PROPERTIES                       "CHART2_HID_SCH_DLG_SPLINE_PROPERTIES"
+#define HID_SCH_DLG_RANGES                                  "CHART2_HID_SCH_DLG_RANGES"
+
+#define HID_SCH_CB_XAXIS                                    "CHART2_HID_SCH_CB_XAXIS"
+#define HID_SCH_CB_YAXIS                                    "CHART2_HID_SCH_CB_YAXIS"
+#define HID_SCH_CB_ZAXIS                                    "CHART2_HID_SCH_CB_ZAXIS"
+#define HID_SCH_CB_SECONDARY_XAXIS                          "CHART2_HID_SCH_CB_SECONDARY_XAXIS"
+#define HID_SCH_CB_SECONDARY_YAXIS                          "CHART2_HID_SCH_CB_SECONDARY_YAXIS"
+#define HID_SCH_CB_SECONDARY_ZAXIS                          "CHART2_HID_SCH_CB_SECONDARY_ZAXIS"
+
+#define HID_SCH_CB_XGRID                                    "CHART2_HID_SCH_CB_XGRID"
+#define HID_SCH_CB_YGRID                                    "CHART2_HID_SCH_CB_YGRID"
+#define HID_SCH_CB_ZGRID                                    "CHART2_HID_SCH_CB_ZGRID"
+#define HID_SCH_CB_SECONDARY_XGRID                          "CHART2_HID_SCH_CB_SECONDARY_XGRID"
+#define HID_SCH_CB_SECONDARY_YGRID                          "CHART2_HID_SCH_CB_SECONDARY_YGRID"
+#define HID_SCH_CB_SECONDARY_ZGRID                          "CHART2_HID_SCH_CB_SECONDARY_ZGRID"
+
+#define HID_SCH_LEGEND_POS_LEFT                             "CHART2_HID_SCH_LEGEND_POS_LEFT"
+#define HID_SCH_LEGEND_POS_TOP                              "CHART2_HID_SCH_LEGEND_POS_TOP"
+#define HID_SCH_LEGEND_POS_RIGHT                            "CHART2_HID_SCH_LEGEND_POS_RIGHT"
+#define HID_SCH_LEGEND_POS_BOTTOM                           "CHART2_HID_SCH_LEGEND_POS_BOTTOM"
+
+#define HID_SCH_STATISTIK_MEANVALUE                         "CHART2_HID_SCH_STATISTIK_MEANVALUE"
+#define HID_SCH_STATISTIK_NO_ERROR                          "CHART2_HID_SCH_STATISTIK_NO_ERROR"
+#define HID_SCH_STATISTIK_VARIANT                           "CHART2_HID_SCH_STATISTIK_VARIANT"
+#define HID_SCH_STATISTIK_SIGMA                             "CHART2_HID_SCH_STATISTIK_SIGMA"
+#define HID_SCH_STATISTIK_PERCENT                           "CHART2_HID_SCH_STATISTIK_PERCENT"
+#define HID_SCH_STATISTIK_BIGERROR                          "CHART2_HID_SCH_STATISTIK_BIGERROR"
+#define HID_SCH_STATISTIK_CONSTERROR                        "CHART2_HID_SCH_STATISTIK_CONSTERROR"
+#define HID_SCH_STATISTIK_PERCENT_VALUE                     "CHART2_HID_SCH_STATISTIK_PERCENT_VALUE"
+#define HID_SCH_STATISTIK_BIGERROR_VALUE                    "CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE"
+#define HID_SCH_STATISTIK_PLUS_VALUE                        "CHART2_HID_SCH_STATISTIK_PLUS_VALUE"
+#define HID_SCH_STATISTIK_MINUS_VALUE                       "CHART2_HID_SCH_STATISTIK_MINUS_VALUE"
+
+#define HID_SCH_DATALABEL_VALUE                             "CHART2_HID_SCH_DATALABEL_VALUE"
+#define HID_SCH_DATALABEL_NUMBER                            "CHART2_HID_SCH_DATALABEL_NUMBER"
+#define HID_SCH_DATALABEL_PERCENT                           "CHART2_HID_SCH_DATALABEL_PERCENT"
+#define HID_SCH_DATALABEL_TEXT                              "CHART2_HID_SCH_DATALABEL_TEXT"
+#define HID_SCH_DATALABEL_SYMBOL                            "CHART2_HID_SCH_DATALABEL_SYMBOL"
+#define HID_SCH_PB_NUMBERFORMAT                             "CHART2_HID_SCH_PB_NUMBERFORMAT"
+#define HID_SCH_PB_PERCENT_NUMBERFORMAT                     "CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT"
+#define HID_SCH_DATALABEL_SEPARATOR                         "CHART2_HID_SCH_DATALABEL_SEPARATOR"
+#define HID_SCH_DATALABEL_PLACEMENT                         "CHART2_HID_SCH_DATALABEL_PLACEMENT"
+#define HID_SCH_TEXTDIRECTION                               "CHART2_HID_SCH_TEXTDIRECTION"
+#define HID_SCH_TEXTDIRECTION_TITLE                         "CHART2_HID_SCH_TEXTDIRECTION_TITLE"
+#define HID_SCH_TEXTDIRECTION_EQUATION                      "CHART2_HID_SCH_TEXTDIRECTION_EQUATION"
+#define HID_SCH_DATALABEL_ROTATION_KNOB                     "CHART2_HID_SCH_DATALABEL_ROTATION_KNOB"
+#define HID_SCH_DATALABEL_ROTATION_EDIT                     "CHART2_HID_SCH_DATALABEL_ROTATION_EDIT"
+
+#define HID_SCH_TITLE_MAIN                                  "CHART2_HID_SCH_TITLE_MAIN"
+#define HID_SCH_TITLE_SUB                                   "CHART2_HID_SCH_TITLE_SUB"
+#define HID_SCH_TITLE_X                                     "CHART2_HID_SCH_TITLE_X"
+#define HID_SCH_TITLE_Y                                     "CHART2_HID_SCH_TITLE_Y"
+#define HID_SCH_TITLE_Z                                     "CHART2_HID_SCH_TITLE_Z"
+#define HID_SCH_TITLE_SECONDARY_X                           "CHART2_HID_SCH_TITLE_SECONDARY_X"
+#define HID_SCH_TITLE_SECONDARY_Y                           "CHART2_HID_SCH_TITLE_SECONDARY_Y"
+
+#define HID_SCH_WIZARD_ROADMAP                              "CHART2_HID_SCH_WIZARD_ROADMAP"
+#define HID_SCH_LEGEND_SHOW                                 "CHART2_HID_SCH_LEGEND_SHOW"
+#define HID_SCH_DATA_SERIES_LABEL                           "CHART2_HID_SCH_DATA_SERIES_LABEL"
+
+#define HID_SCH_STARTING_ANGLE_DIAL                         "CHART2_HID_SCH_STARTING_ANGLE_DIAL"
+
+#define HID_SCH_TRENDLINE_RB_NONE                           "CHART2_HID_SCH_TRENDLINE_RB_NONE"
+#define HID_SCH_TRENDLINE_RB_LINEAR                         "CHART2_HID_SCH_TRENDLINE_RB_LINEAR"
+#define HID_SCH_TRENDLINE_RB_LOGARITHMIC                    "CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC"
+#define HID_SCH_TRENDLINE_RB_EXPONENTIAL                    "CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL"
+#define HID_SCH_TRENDLINE_RB_POWER                          "CHART2_HID_SCH_TRENDLINE_RB_POWER"
+#define HID_SCH_TRENDLINE_SHOW_EQUATION                     "CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION"
+#define HID_SCH_TRENDLINE_SHOW_R_SQUARED                    "CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED"
+
+#define HID_SCH_STATISTIK_FUNCTION                          "CHART2_HID_SCH_STATISTIK_FUNCTION"
+#define HID_SCH_STATISTIK_RANGE                             "CHART2_HID_SCH_STATISTIK_RANGE"
+#define HID_SCH_STATISTIK_FUNCTION_LB                       "CHART2_HID_SCH_STATISTIK_FUNCTION_LB"
+#define HID_SCH_STATISTIK_POSITIVE_VALUE                    "CHART2_HID_SCH_STATISTIK_POSITIVE_VALUE"
+#define HID_SCH_STATISTIK_POSITIVE_RANGE                    "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE"
+#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER            "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER"
+#define HID_SCH_STATISTIK_NEGATIVE_VALUE                    "CHART2_HID_SCH_STATISTIK_NEGATIVE_VALUE"
+#define HID_SCH_STATISTIK_NEGATIVE_RANGE                    "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE"
+#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER            "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER"
+#define HID_SCH_STATISTIK_SAME_FOR_BOTH                     "CHART2_HID_SCH_STATISTIK_SAME_FOR_BOTH"
+#define HID_SCH_STATISTIK_SHOW_BOTH                         "CHART2_HID_SCH_STATISTIK_SHOW_BOTH"
+#define HID_SCH_STATISTIK_SHOW_POSITIVE                     "CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE"
+#define HID_SCH_STATISTIK_SHOW_NEGATIVE                     "CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE"
+
+#define HID_INSERT_GRIDS                                    "CHART2_HID_INSERT_GRIDS"
+
+#define HID_DIAGRAM_TYPE                                    "CHART2_HID_DIAGRAM_TYPE"
+#define HID_3D_VIEW                                         "CHART2_HID_3D_VIEW"
+#define HID_DIAGRAM_DATA                                    "CHART2_HID_DIAGRAM_DATA"
+#define HID_INSERT_AXIS                                     "CHART2_HID_INSERT_AXIS"
+#define HID_INSERT_STATISTICS                               "CHART2_HID_INSERT_STATISTICS"
+#define HID_INSERT_TITLE                                    "CHART2_HID_INSERT_TITLE"
+#define HID_INSERT_CHART_LEGEND                             "CHART2_HID_INSERT_CHART_LEGEND"
+#define HID_INSERT_DESCRIPTION                              "CHART2_HID_INSERT_DESCRIPTION"
 
 
 #endif
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index 1f077b301..6efc02f38 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -59,7 +59,7 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent,
         , m_pWindowController( pWindowController )
         , m_bInPaint(false)
 {
-    this->SetSmartHelpId( SmartId( HID_SCH_WIN_DOCUMENT ) );
+    this->SetHelpId( HID_SCH_WIN_DOCUMENT );
     this->SetMapMode( MapMode(MAP_100TH_MM) );
     adjustHighContrastMode();
     // chart does not depend on exact pixel painting => enable antialiased drawing