CWS changehid: #i111874#: change code to support HelpIds as byte strings

22 files changed, 27 insertions, 45 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 ));