summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-07-10 18:21:24 +0200
committerMathias Bauer <mba@openoffice.org>2010-07-10 18:21:24 +0200
commit4a02c63d1431b2e8686a035e119c4a2f5c972592 (patch)
tree06a7b49c95fb2c8de73679b96e5eb33c4d251f25 /chart2
parent48fbbe2989e13b073c266345081c0ed73e2ec0ef (diff)
CWS changehid: #i111874#: change code to support HelpIds as byte strings
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx3
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx21
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertDataLabel.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.src1
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertLegend.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTitle.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertTrendline.src2
-rw-r--r--chart2/source/controller/dialogs/dlg_View3D.src3
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.src3
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.src2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.src1
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.src1
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.src1
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx3
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.src1
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx9
-rw-r--r--chart2/source/controller/inc/HelpIds.hrc266
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx3
24 files changed, 152 insertions, 189 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index bd50a4144d9b..5e8bd7336b86 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1156,8 +1156,7 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c
m_pMF_NumberOfLines->SetLast( 100, FUNIT_CUSTOM );
m_pMF_NumberOfLines->SetMin( 1, FUNIT_CUSTOM );
m_pMF_NumberOfLines->SetMax( 100, FUNIT_CUSTOM );
- // FIXME: HELPID
- m_pMF_NumberOfLines->SetHelpId( ""/*HID_SCH_NUM_OF_LINES*/ );
+ m_pMF_NumberOfLines->SetHelpId( HID_SCH_NUM_OF_LINES );
m_pMF_NumberOfLines->SetModifyHdl( LINK( this, CombiColumnLineChartDialogController, ChangeLineCountHdl ) );
}
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 74ab52795f32..513d49b6aad8 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -241,8 +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 ));
- // FIXME: HELPID
- m_spSeriesName->SetHelpId( ""/*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 88974a501dc7..e7a7a8bd43d8 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -117,8 +117,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
#endif
, WZS_INVALID_STATE
);
- // FIXME: HELPID
- this->SetRoadmapHelpId( ""/*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_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index b9d0b842e836..9469293ae1c5 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -187,8 +187,7 @@ DataSourceDialog::DataSourceDialog(
m_pTabControl->SelectTabPage( m_nLastPageId );
- // FIXME: HELPID
- SetHelpId( ""/*HID_SCH_DLG_RANGES*/ );
+ SetHelpId( HID_SCH_DLG_RANGES );
}
DataSourceDialog::~DataSourceDialog()
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index ca4c21a3ba01..0a250b5bf874 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -88,22 +88,15 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
FreeResource();
if(!bAxisDlg)
{
- // FIXME: HELPID
- SetHelpId( ""/*SID_INSERT_GRIDS*/ );
+ SetHelpId( HID_INSERT_GRIDS );
SetText( ObjectNameProvider::getName(OBJECTTYPE_GRID,true) );
- // FIXME: HELPID
- aCbPrimaryX.SetHelpId( ""/*HID_SCH_CB_XGRID*/ );
- // FIXME: HELPID
- aCbPrimaryY.SetHelpId( ""/*HID_SCH_CB_YGRID*/ );
- // FIXME: HELPID
- aCbPrimaryZ.SetHelpId( ""/*HID_SCH_CB_ZGRID*/ );
- // FIXME: HELPID
- aCbSecondaryX.SetHelpId( ""/*HID_SCH_CB_SECONDARY_XGRID*/ );
- // FIXME: HELPID
- aCbSecondaryY.SetHelpId( ""/*HID_SCH_CB_SECONDARY_YGRID*/ );
- // FIXME: HELPID
- aCbSecondaryZ.SetHelpId( ""/*HID_SCH_CB_SECONDARY_ZGRID*/ );
+ aCbPrimaryX.SetHelpId( HID_SCH_CB_XGRID );
+ aCbPrimaryY.SetHelpId( HID_SCH_CB_YGRID );
+ aCbPrimaryZ.SetHelpId( HID_SCH_CB_ZGRID );
+ aCbSecondaryX.SetHelpId( HID_SCH_CB_SECONDARY_XGRID );
+ aCbSecondaryY.SetHelpId( HID_SCH_CB_SECONDARY_YGRID );
+ aCbSecondaryZ.SetHelpId( HID_SCH_CB_SECONDARY_ZGRID );
aFlPrimary.Hide();
aFlSecondary.Hide();
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..f7a61cf1e283 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src
@@ -33,7 +33,6 @@
ModalDialog DLG_DATA_YERRORBAR
{
-// HelpID = SID_INSERT_STATISTICS ;
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 9e957b4b203b..cfe8ab3493e0 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 ( 135 , 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/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
index 329eb25e0e51..e27ce72535a4 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 ;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src
index a9bb2a039f3c..c127cc184cba 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 ) ;
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src
index 03748914255f..aede04751907 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.src
@@ -31,7 +31,6 @@
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_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src
index 54c591c0865d..39e1e1e9e21d 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.src
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.src
@@ -30,7 +30,6 @@
TabPage TP_LAYOUT
{
Hide = TRUE ;
-// HelpID = HID_LAYOUT ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
};
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
index bc434be7ef07..994a44ec39ef 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
@@ -30,7 +30,6 @@
TabPage TP_OPTIONS
{
Hide = TRUE ;
-// HelpID = HID_LAYOUT ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
FixedLine 1
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index a1915c4b9583..5b1d5647dc6c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -68,8 +68,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow,
aFtTextDirection.SetPosPixel( aFtTextDirection.GetPosPixel() + aMove );
aLbTextDirection.SetPosPixel( aLbTextDirection.GetPosPixel() + aMove );
- // FIXME: HELPID
- aLbTextDirection.SetHelpId( ""/*HID_SCH_TEXTDIRECTION_EQUATION*/ );
+ aLbTextDirection.SetHelpId( HID_SCH_TEXTDIRECTION_EQUATION );
}
}
diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src
index efa11d3e2d67..f7a3fa33a6d8 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.src
+++ b/chart2/source/controller/dialogs/tp_Trendline.src
@@ -31,7 +31,6 @@
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.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 40ea37d217a7..8c97de81dd5d 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -75,12 +75,9 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent
aFont.SetWeight( WEIGHT_BOLD );
m_aFT_TitleDescription.SetControlFont( aFont );
- // FIXME: HELPID
- m_aCB_Grid_X.SetHelpId( ""/*HID_SCH_CB_XGRID*/ );
- // FIXME: HELPID
- m_aCB_Grid_Y.SetHelpId( ""/*HID_SCH_CB_YGRID*/ );
- // FIXME: HELPID
- m_aCB_Grid_Z.SetHelpId( ""/*HID_SCH_CB_ZGRID*/ );
+ m_aCB_Grid_X.SetHelpId( HID_SCH_CB_XGRID );
+ m_aCB_Grid_Y.SetHelpId( HID_SCH_CB_YGRID );
+ m_aCB_Grid_Z.SetHelpId( HID_SCH_CB_ZGRID );
m_apTitleResources->SetUpdateDataHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl ));
m_apLegendPositionResources->SetChangeHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl ));
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 1052b7ea962f..c6b5f456b059 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -28,155 +28,137 @@
#define CHART_HELPIDS_HRC
#include <svl/solar.hrc>
-//next is 120
-//free: 20, 21, 22, 30, 31, 32, 33
-//see old chart: schhids.h
+#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"
-/*
-#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 "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_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 5400524e8a1e..54add217fb76 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -59,8 +59,7 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent,
, m_pWindowController( pWindowController )
, m_bInPaint(false)
{
- // FIXME: HELPID
- this->SetHelpId( ""/*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