diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
commit | 4a02c63d1431b2e8686a035e119c4a2f5c972592 (patch) | |
tree | 06a7b49c95fb2c8de73679b96e5eb33c4d251f25 | |
parent | 48fbbe2989e13b073c266345081c0ed73e2ec0ef (diff) |
CWS changehid: #i111874#: change code to support HelpIds as byte strings
82 files changed, 1352 insertions, 2222 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 diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index fbc1444cc6de..f8c47ab24446 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -40,6 +40,7 @@ #include <i18npool/lang.h> #include <rtl/ustring.h> #include "scdllapi.h" +#include <rtl/ustring.hxx> #ifndef SC_SCMATRIX_HXX #include "scmatrix.hxx" @@ -99,14 +100,14 @@ private: ScAddInArgDesc* pArgDescs; long nCallerPos; USHORT nCategory; - USHORT nHelpId; + rtl::OString sHelpId; mutable com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName> aCompNames; mutable BOOL bCompInitialized; public: ScUnoAddInFuncData( const String& rNam, const String& rLoc, const String& rDesc, - USHORT nCat, USHORT nHelp, + USHORT nCat, const rtl::OString&, const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rFunc, const com::sun::star::uno::Any& rO, @@ -126,7 +127,7 @@ public: long GetCallerPos() const { return nCallerPos; } const String& GetDescription() const { return aDescription; } USHORT GetCategory() const { return nCategory; } - USHORT GetHelpId() const { return nHelpId; } + const rtl::OString GetHelpId() const { return sHelpId; } const com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName>& GetCompNames() const; BOOL GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const; diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index a8f495440554..a46b8f52a638 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -57,7 +57,7 @@ public: virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const ; virtual void initArgumentInfo() const; virtual ::rtl::OUString getSignature() const ; - virtual long getHelpId() const ; + virtual rtl::OString getHelpId() const ; // parameter virtual sal_uInt32 getParameterCount() const ; @@ -100,7 +100,7 @@ public: USHORT nFIndex; // Unique function index USHORT nCategory; // Function category USHORT nArgCount; // All parameter count, suppressed and unsuppressed - USHORT nHelpId; // HelpID of function + rtl::OString sHelpId; // HelpID of function bool bIncomplete :1; // Incomplete argument info (set for add-in info from configuration) bool bHasSuppressedArgs :1; // Whether there is any suppressed parameter. }; diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index a7d05925957a..10d61b783c18 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -35,6 +35,10 @@ #include <svx/dialogs.hrc> // ->Svx-IDs #endif +#include "sfx2/sfxcommands.h" +#include "svx/svxcommands.h" +#include "sccommands.h" + #define VAR_ARGS 30 // variable Parameter in scfuncs.src #define RID_HANDLEBITMAP 10005 @@ -59,28 +63,28 @@ // Calc hat einen Bereich von 2000 IDs // Die Funktionen brauchen 11*90 = 990 IDs -#define HID_SC_FUNC_START (HID_SC_START + 0) -#define HID_INSWIN_START (HID_SC_START + 1000) +//#define HID_SC_FUNC_START (HID_SC_START + 0) +//#define HID_INSWIN_START (HID_SC_START + 1000) #define HID_SC_SHEET_START (HID_SC_START + 1010) #define HID_SC_SHELL_START (HID_SC_START + 1030) -#define HID_SC_WIN_START (HID_SC_START + 1050) -#define HID_SC_CONTROL_START (HID_SC_START + 1070) -#define HID_SC_DLG_START (HID_SC_START + 1100) -#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) -#define HID_SC_MENU_START (HID_SC_START + 1180) -#define HID_SC_OTHER_START (HID_SC_START + 1230) -#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions -#define HID_SC_DAI_FUNCS_START (HID_SC_START + 1420) // DateFunc Addin Functions +//#define HID_SC_WIN_START (HID_SC_START + 1050) +//#define HID_SC_CONTROL_START (HID_SC_START + 1070) +#define HID_SC_DLG_HACK_START (HID_SC_START + 1100) +//#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) +//#define HID_SC_MENU_START (HID_SC_START + 1180) +//#define HID_SC_OTHER_START (HID_SC_START + 1230) +//#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions +//#define HID_SC_DAI_FUNCS_START (HID_SC_START + 1420) // DateFunc Addin Functions // --------------------------------------------------------------------------- -#define HID_INSWIN_POS (HID_INSWIN_START + 0 ) -#define HID_INSWIN_CALC (HID_INSWIN_START + 1 ) -#define HID_INSWIN_CANCEL (HID_INSWIN_START + 2 ) -#define HID_INSWIN_OK (HID_INSWIN_START + 3 ) -#define HID_INSWIN_SUMME (HID_INSWIN_START + 4 ) -#define HID_INSWIN_FUNC (HID_INSWIN_START + 5 ) -#define HID_INSWIN_INPUT (HID_INSWIN_START + 6 ) +#define HID_INSWIN_POS "SC_HID_INSWIN_POS" +#define HID_INSWIN_CALC "SC_HID_INSWIN_CALC" +#define HID_INSWIN_CANCEL "SC_HID_INSWIN_CANCEL" +#define HID_INSWIN_OK "SC_HID_INSWIN_OK" +#define HID_INSWIN_SUMME "SC_HID_INSWIN_SUMME" +#define HID_INSWIN_FUNC "SC_HID_INSWIN_FUNC" +#define HID_INSWIN_INPUT "SC_HID_INSWIN_INPUT" // Hilfe IDs fuer Vorlagen --------------------------------------------------- #define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 ) @@ -109,361 +113,368 @@ #define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) #define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) + // Hilfe IDs fuer Dokumentfenster -------------------------------------------- -#define HID_SC_WIN_GRIDWIN ( HID_SC_WIN_START ) -#define HID_SC_WIN_PREVIEW ( HID_SC_WIN_START + 1 ) +#define HID_SC_WIN_GRIDWIN "SC_HID_SC_WIN_GRIDWIN" +#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW" // Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- // Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts -#define HID_SC_HF_HLL ( HID_SC_CONTROL_START + 0 ) -#define HID_SC_HF_HLC ( HID_SC_CONTROL_START + 1 ) -#define HID_SC_HF_HLR ( HID_SC_CONTROL_START + 2 ) -#define HID_SC_HF_HRL ( HID_SC_CONTROL_START + 3 ) -#define HID_SC_HF_HRC ( HID_SC_CONTROL_START + 4 ) -#define HID_SC_HF_HRR ( HID_SC_CONTROL_START + 5 ) -#define HID_SC_HF_FLL ( HID_SC_CONTROL_START + 6 ) -#define HID_SC_HF_FLC ( HID_SC_CONTROL_START + 7 ) -#define HID_SC_HF_FLR ( HID_SC_CONTROL_START + 8 ) -#define HID_SC_HF_FRL ( HID_SC_CONTROL_START + 9 ) -#define HID_SC_HF_FRC ( HID_SC_CONTROL_START + 10 ) -#define HID_SC_HF_FRR ( HID_SC_CONTROL_START + 11 ) +#define HID_SC_HF_HLL "SC_HID_SC_HF_HLL" +#define HID_SC_HF_HLC "SC_HID_SC_HF_HLC" +#define HID_SC_HF_HLR "SC_HID_SC_HF_HLR" +#define HID_SC_HF_HRL "SC_HID_SC_HF_HRL" +#define HID_SC_HF_HRC "SC_HID_SC_HF_HRC" +#define HID_SC_HF_HRR "SC_HID_SC_HF_HRR" +#define HID_SC_HF_FLL "SC_HID_SC_HF_FLL" +#define HID_SC_HF_FLC "SC_HID_SC_HF_FLC" +#define HID_SC_HF_FLR "SC_HID_SC_HF_FLR" +#define HID_SC_HF_FRL "SC_HID_SC_HF_FRL" +#define HID_SC_HF_FRC "SC_HID_SC_HF_FRC" +#define HID_SC_HF_FRR "SC_HID_SC_HF_FRR" // "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! -//#define HID_SC_SUBT_COLS_1 ( HID_SC_CONTROL_START + 12 ) -//#define HID_SC_SUBT_COLS_2 ( HID_SC_CONTROL_START + 13 ) -//#define HID_SC_SUBT_COLS_3 ( HID_SC_CONTROL_START + 14 ) +#define HID_SC_SUBT_COLS_1 "SC_HID_SC_SUBT_COLS_1" +#define HID_SC_SUBT_COLS_2 "SC_HID_SC_SUBT_COLS_2" +#define HID_SC_SUBT_COLS_3 "SC_HID_SC_SUBT_COLS_3" // Eintraege im Navigator -#define HID_SC_NAVIPI_ENTRIES ( HID_SC_CONTROL_START + 15 ) -#define HID_SC_NAVIPI_ROW ( HID_SC_CONTROL_START + 16 ) -#define HID_SC_NAVIPI_COL ( HID_SC_CONTROL_START + 17 ) -#define HID_SC_NAVIPI_DOC ( HID_SC_CONTROL_START + 18 ) -#define HID_SC_NAVIPI_DATA ( HID_SC_CONTROL_START + 19 ) -#define HID_SC_NAVIPI_UP ( HID_SC_CONTROL_START + 20 ) -#define HID_SC_NAVIPI_DOWN ( HID_SC_CONTROL_START + 21 ) -#define HID_SC_NAVIPI_ZOOM ( HID_SC_CONTROL_START + 22 ) -#define HID_SC_NAVIPI_ROOT ( HID_SC_CONTROL_START + 23 ) -#define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 ) -#define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 ) +#define HID_SC_NAVIPI_ENTRIES "SC_HID_SC_NAVIPI_ENTRIES" +#define HID_SC_NAVIPI_ROW "SC_HID_SC_NAVIPI_ROW" +#define HID_SC_NAVIPI_COL "SC_HID_SC_NAVIPI_COL" +#define HID_SC_NAVIPI_DOC "SC_HID_SC_NAVIPI_DOC" +#define HID_SC_NAVIPI_DATA "SC_HID_SC_NAVIPI_DATA" +#define HID_SC_NAVIPI_UP "SC_HID_SC_NAVIPI_UP" +#define HID_SC_NAVIPI_DOWN "SC_HID_SC_NAVIPI_DOWN" +#define HID_SC_NAVIPI_ZOOM "SC_HID_SC_NAVIPI_ZOOM" +#define HID_SC_NAVIPI_ROOT "SC_HID_SC_NAVIPI_ROOT" +#define HID_SC_NAVIPI_SCEN "SC_HID_SC_NAVIPI_SCEN" +#define HID_SC_NAVIPI_DROP "SC_HID_SC_NAVIPI_DROP" // Teilergebnisse -#define HID_SC_SUBT_GROUP ( HID_SC_CONTROL_START + 26 ) -#define HID_SC_SUBT_COLS ( HID_SC_CONTROL_START + 27 ) -#define HID_SC_SUBT_FUNC ( HID_SC_CONTROL_START + 28 ) +#define HID_SC_SUBT_GROUP "SC_HID_SC_SUBT_GROUP" +#define HID_SC_SUBT_COLS "SC_HID_SC_SUBT_COLS" +#define HID_SC_SUBT_FUNC "SC_HID_SC_SUBT_FUNC" // -#define HID_SC_NAVIPI_TOOLBOX ( HID_SC_CONTROL_START + 29 ) +#define HID_SC_NAVIPI_TOOLBOX "SC_HID_SC_NAVIPI_TOOLBOX" // Bereich ist voll! // Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- -#define HID_SC_AUTOFORMAT (HID_SC_DLG_START ) -#define HID_SC_PIVOTFILTER (HID_SC_DLG_START +1 ) -#define HID_SC_INPORTOPT (HID_SC_DLG_START +2 ) -#define HID_SC_PIVOTSUBT (HID_SC_DLG_START +3 ) -#define HID_SC_FORM_ARGS (HID_SC_DLG_START +4 ) -#define HID_SCPAGE_SORT_FIELDS (HID_SC_DLG_START +5 ) -#define HID_SCPAGE_SORT_OPTIONS (HID_SC_DLG_START +6 ) -#define HID_SCPAGE_SUBT_OPTIONS (HID_SC_DLG_START +7 ) -#define HID_SCPAGE_SUBT_GROUP (HID_SC_DLG_START +8 ) -#define HID_SCPAGE_PROTECTION (HID_SC_DLG_START +9 ) -#define HID_SCPAGE_VIEW (HID_SC_DLG_START +10 ) -#define HID_SCPAGE_CALC (HID_SC_DLG_START +11 ) -#define HID_SCPAGE_USERLISTS (HID_SC_DLG_START +12 ) -#define HID_SCPAGE_HFEDIT (HID_SC_DLG_START +13 ) -#define HID_SCPAGE_AREAS (HID_SC_DLG_START +14 ) -#define HID_SCPAGE_TABLE (HID_SC_DLG_START +15 ) -#define HID_SCPAGE_PRINT (HID_SC_DLG_START +16 ) - -#define HID_SCPAGE_SUBT_GROUP1 (HID_SC_DLG_START +17 ) -#define HID_SCPAGE_SUBT_GROUP2 (HID_SC_DLG_START +18 ) -#define HID_SCPAGE_SUBT_GROUP3 (HID_SC_DLG_START +19 ) - -#define HID_SCPAGE_HFED_HL (HID_SC_DLG_START +20 ) -#define HID_SCPAGE_HFED_HR (HID_SC_DLG_START +21 ) -#define HID_SCPAGE_HFED_FL (HID_SC_DLG_START +22 ) -#define HID_SCPAGE_HFED_FR (HID_SC_DLG_START +23 ) - -#define HID_SCPAGE_CONTENT (HID_SC_DLG_START +24 ) -#define HID_SCPAGE_LAYOUT (HID_SC_DLG_START +25 ) -#define HID_SCPAGE_INPUT (HID_SC_DLG_START +26 ) - -#define HID_SC_NAVIGATOR (HID_SC_DLG_START +27 ) - -#define HID_SC_MTRIN_VAL (HID_SC_DLG_START +28 ) -#define HID_SC_MTRIN_DEF (HID_SC_DLG_START +29 ) -#define HID_SC_SELENTRY_LIST (HID_SC_DLG_START +30 ) -#define HID_SC_GROUP_COLS (HID_SC_DLG_START +31 ) -#define HID_SC_GROUP_ROWS (HID_SC_DLG_START +32 ) - -#define HID_SC_HF_TEXT (HID_SC_DLG_START +33 ) -#define HID_SC_HF_FILE (HID_SC_DLG_START +34 ) -#define HID_SC_HF_TABLE (HID_SC_DLG_START +35 ) -#define HID_SC_HF_PAGE (HID_SC_DLG_START +36 ) -#define HID_SC_HF_PAGES (HID_SC_DLG_START +37 ) -#define HID_SC_HF_DATE (HID_SC_DLG_START +38 ) -#define HID_SC_HF_TIME (HID_SC_DLG_START +39 ) - -#define HID_SC_HEADER_EDIT (HID_SC_DLG_START +40 ) -#define HID_SC_FOOTER_EDIT (HID_SC_DLG_START +41 ) - -#define HID_SC_SCENWIN_TOP (HID_SC_DLG_START +42 ) -#define HID_SC_SCENWIN_BOTTOM (HID_SC_DLG_START +43 ) - -#define HID_SC_INPUTWIN (HID_SC_DLG_START +44 ) - -#define HID_SC_RENAME_NAME (HID_SC_DLG_START +45 ) -#define HID_SC_APPEND_NAME (HID_SC_DLG_START +46 ) +#define HID_SC_AUTOFORMAT "SC_HID_SC_AUTOFORMAT" +#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER" +#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT" +#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT" +#define HID_SC_FORM_ARGS "SC_HID_SC_FORM_ARGS" +#define HID_SCPAGE_SORT_FIELDS "SC_HID_SCPAGE_SORT_FIELDS" +#define HID_SCPAGE_SORT_OPTIONS "SC_HID_SCPAGE_SORT_OPTIONS" +#define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS" +#define HID_SCPAGE_SUBT_GROUP "SC_HID_SCPAGE_SUBT_GROUP" +#define HID_SCPAGE_PROTECTION "SC_HID_SCPAGE_PROTECTION" +#define HID_SCPAGE_VIEW "SC_HID_SCPAGE_VIEW" +#define HID_SCPAGE_CALC "SC_HID_SCPAGE_CALC" +#define HID_SCPAGE_USERLISTS "SC_HID_SCPAGE_USERLISTS" +#define HID_SCPAGE_HFEDIT "SC_HID_SCPAGE_HFEDIT" +#define HID_SCPAGE_AREAS "SC_HID_SCPAGE_AREAS" +#define HID_SCPAGE_TABLE "SC_HID_SCPAGE_TABLE" +#define HID_SCPAGE_PRINT "SC_HID_SCPAGE_PRINT" + +#define HID_SCPAGE_SUBT_GROUP1 "SC_HID_SCPAGE_SUBT_GROUP1" +#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2" +#define HID_SCPAGE_SUBT_GROUP3 "SC_HID_SCPAGE_SUBT_GROUP3" + +#define HID_SCPAGE_HFED_HL "SC_HID_SCPAGE_HFED_HL" +#define HID_SCPAGE_HFED_HR "SC_HID_SCPAGE_HFED_HR" +#define HID_SCPAGE_HFED_FL "SC_HID_SCPAGE_HFED_FL" +#define HID_SCPAGE_HFED_FR "SC_HID_SCPAGE_HFED_FR" + +#define HID_SCPAGE_CONTENT "SC_HID_SCPAGE_CONTENT" +#define HID_SCPAGE_LAYOUT "SC_HID_SCPAGE_LAYOUT" +#define HID_SCPAGE_INPUT "SC_HID_SCPAGE_INPUT" + +#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR" + +#define HID_SC_MTRIN_VAL "SC_HID_SC_MTRIN_VAL" +#define HID_SC_MTRIN_DEF "SC_HID_SC_MTRIN_DEF" +#define HID_SC_SELENTRY_LIST "SC_HID_SC_SELENTRY_LIST" +#define HID_SC_GROUP_COLS "SC_HID_SC_GROUP_COLS" +#define HID_SC_GROUP_ROWS "SC_HID_SC_GROUP_ROWS" + +#define HID_SC_HF_TEXT "SC_HID_SC_HF_TEXT" +#define HID_SC_HF_FILE "SC_HID_SC_HF_FILE" +#define HID_SC_HF_TABLE "SC_HID_SC_HF_TABLE" +#define HID_SC_HF_PAGE "SC_HID_SC_HF_PAGE" +#define HID_SC_HF_PAGES "SC_HID_SC_HF_PAGES" +#define HID_SC_HF_DATE "SC_HID_SC_HF_DATE" +#define HID_SC_HF_TIME "SC_HID_SC_HF_TIME" + +#define HID_SC_HEADER_EDIT "SC_HID_SC_HEADER_EDIT" +#define HID_SC_FOOTER_EDIT "SC_HID_SC_FOOTER_EDIT" + +#define HID_SC_SCENWIN_TOP "SC_HID_SC_SCENWIN_TOP" +#define HID_SC_SCENWIN_BOTTOM "SC_HID_SC_SCENWIN_BOTTOM" + +#define HID_SC_INPUTWIN "SC_HID_SC_INPUTWIN" + +#define HID_SC_RENAME_NAME "SC_HID_SC_RENAME_NAME" +#define HID_SC_APPEND_NAME "SC_HID_SC_APPEND_NAME" // Funktionsautopilot: nur als Unique-IDs -#define HID_SC_FAP_PAGE (HID_SC_DLG_START +47 ) -#define HID_SC_FAP_EDIT1 (HID_SC_DLG_START +48 ) -#define HID_SC_FAP_EDIT2 (HID_SC_DLG_START +49 ) -#define HID_SC_FAP_EDIT3 (HID_SC_DLG_START +50 ) -#define HID_SC_FAP_EDIT4 (HID_SC_DLG_START +51 ) +#define HID_SC_FAP_PAGE "SC_HID_SC_FAP_PAGE" +#define HID_SC_FAP_EDIT1 "SC_HID_SC_FAP_EDIT1" +#define HID_SC_FAP_EDIT2 "SC_HID_SC_FAP_EDIT2" +#define HID_SC_FAP_EDIT3 "SC_HID_SC_FAP_EDIT3" +#define HID_SC_FAP_EDIT4 "SC_HID_SC_FAP_EDIT4" -#define HID_SC_ADD_AUTOFMT (HID_SC_DLG_START +52 ) -#define HID_SC_AUTOFMT_NAME (HID_SC_DLG_START +53 ) +#define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT" +#define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME" -#define HID_SC_DROPMODE_URL (HID_SC_DLG_START +54 ) -#define HID_SC_DROPMODE_LINK (HID_SC_DLG_START +55 ) -#define HID_SC_DROPMODE_COPY (HID_SC_DLG_START +56 ) +#define HID_SC_DROPMODE_URL "SC_HID_SC_DROPMODE_URL" +#define HID_SC_DROPMODE_LINK "SC_HID_SC_DROPMODE_LINK" +#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY" -#define HID_SC_FAP_STRUCT (HID_SC_DLG_START +57 ) -#define HID_SC_ASCII_TABCTR (HID_SC_DLG_START +58 ) +#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT" +#define HID_SC_ASCII_TABCTR "SC_HID_SC_ASCII_TABCTR" -#define HID_SC_SCENARIO_DELETE (HID_SC_DLG_START +59 ) -#define HID_SC_SCENARIO_EDIT (HID_SC_DLG_START +60 ) +#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE" +#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT" -#define HID_SCDLG_FORMULA (HID_SC_DLG_START +61 ) -#define HID_SCDLG_CONDFORMAT (HID_SC_DLG_START +62 ) -#define HID_COLROWNAMERANGES (HID_SC_DLG_START +63 ) +#define HID_SCDLG_FORMULA "SC_HID_SCDLG_FORMULA" +#define HID_SCDLG_CONDFORMAT "SC_HID_SCDLG_CONDFORMAT" +#define HID_COLROWNAMERANGES "SC_HID_COLROWNAMERANGES" -#define HID_FUNCTION_BOX (HID_SC_DLG_START +64 ) -#define HID_SCPAGE_OPREDLINE (HID_SC_DLG_START +65 ) -#define HID_SC_REDLIN_CTR (HID_SC_DLG_START +66 ) +#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX" +#define HID_SCPAGE_OPREDLINE "SC_HID_SCPAGE_OPREDLINE" +#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR" //Kopf/FusszeilenDlg: Contextmenue fuer Dateiname -#define HID_FCOMMAND_TITEL (HID_SC_DLG_START +67 ) -#define HID_FCOMMAND_FILENAME (HID_SC_DLG_START +68 ) -#define HID_FCOMMAND_PATH (HID_SC_DLG_START +69 ) +#define HID_FCOMMAND_TITEL "SC_HID_FCOMMAND_TITEL" +#define HID_FCOMMAND_FILENAME "SC_HID_FCOMMAND_FILENAME" +#define HID_FCOMMAND_PATH "SC_HID_FCOMMAND_PATH" // Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- -#define HID_SC_TOOLBOX_TOOLS ( HID_SC_TOOLBOX_START ) -#define HID_SC_TOOLBOX_TABLE ( HID_SC_TOOLBOX_START + 1 ) -#define HID_SC_TOOLBOX_DRAW ( HID_SC_TOOLBOX_START + 2 ) -#define HID_SC_TOOLBOX_DRTEXT ( HID_SC_TOOLBOX_START + 3 ) -#define HID_SC_TOOLBOX_PREVIEW ( HID_SC_TOOLBOX_START + 4 ) +#define HID_SC_TOOLBOX_TOOLS "SC_HID_SC_TOOLBOX_TOOLS" +#define HID_SC_TOOLBOX_TABLE "SC_HID_SC_TOOLBOX_TABLE" +#define HID_SC_TOOLBOX_DRAW "SC_HID_SC_TOOLBOX_DRAW" +#define HID_SC_TOOLBOX_DRTEXT "SC_HID_SC_TOOLBOX_DRTEXT" +#define HID_SC_TOOLBOX_PREVIEW "SC_HID_SC_TOOLBOX_PREVIEW" // wrong group - HID_SC_DLG_START is full -#define HID_SC_RENAME_AUTOFMT ( HID_SC_TOOLBOX_START + 5 ) -#define HID_SC_REN_AFMT_NAME ( HID_SC_TOOLBOX_START + 6 ) +#define HID_SC_RENAME_AUTOFMT "SC_HID_SC_RENAME_AUTOFMT" +#define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME" -#define HID_SC_TOOLBOX_GRAPHIC ( HID_SC_TOOLBOX_START + 7 ) +#define HID_SC_TOOLBOX_GRAPHIC "SC_HID_SC_TOOLBOX_GRAPHIC" -#define HID_CHG_PROTECT ( HID_SC_TOOLBOX_START + 8 ) +#define HID_CHG_PROTECT "SC_HID_CHG_PROTECT" -#define HID_SC_RENAME_OBJECT ( HID_SC_TOOLBOX_START + 9 ) +#define HID_SC_RENAME_OBJECT "SC_HID_SC_RENAME_OBJECT" -#define HID_SC_REN_AFMT_DLG ( HID_SC_TOOLBOX_START + 10 ) +#define HID_SC_REN_AFMT_DLG "SC_HID_SC_REN_AFMT_DLG" // Hilfe IDs fuer Submenus (max.50) ------------------------------------------ -#define HID_SCMENU_EDIT ( HID_SC_MENU_START ) -#define HID_SCMENU_FILL ( HID_SC_MENU_START + 1 ) -#define HID_SCMENU_DELBREAK ( HID_SC_MENU_START + 2 ) -#define HID_SCMENU_VIEW ( HID_SC_MENU_START + 3 ) -#define HID_SCMENU_TOOLBARS ( HID_SC_MENU_START + 4 ) -#define HID_SCMENU_INSERT ( HID_SC_MENU_START + 5 ) -#define HID_SCMENU_INSBREAK ( HID_SC_MENU_START + 6 ) -#define HID_SCMENU_NAME ( HID_SC_MENU_START + 7 ) -#define HID_SCMENU_GRAPHIC ( HID_SC_MENU_START + 8 ) -#define HID_SCMENU_DATA ( HID_SC_MENU_START + 9 ) -#define HID_SCMENU_FILTER ( HID_SC_MENU_START + 10 ) -#define HID_SCMENU_OUTLINE ( HID_SC_MENU_START + 11 ) -#define HID_SCMENU_PIVOT ( HID_SC_MENU_START + 12 ) -#define HID_SCMENU_EXTRA ( HID_SC_MENU_START + 13 ) -#define HID_SCMENU_SPELLING ( HID_SC_MENU_START + 14 ) -#define HID_SCMENU_AUDIT ( HID_SC_MENU_START + 15 ) -#define HID_SCMENU_PROTECT ( HID_SC_MENU_START + 16 ) -#define HID_SCMENU_CELLCONT ( HID_SC_MENU_START + 17 ) -#define HID_SCMENU_ROW ( HID_SC_MENU_START + 18 ) -#define HID_SCMENU_COL ( HID_SC_MENU_START + 19 ) -#define HID_SCMENU_TAB ( HID_SC_MENU_START + 20 ) -#define HID_SCMENU_MERGE ( HID_SC_MENU_START + 21 ) -#define HID_SCMENU_AREA ( HID_SC_MENU_START + 22 ) -#define HID_SCMENU_OBJMIRROR ( HID_SC_MENU_START + 23 ) -#define HID_SCMENU_OBJARRANGE ( HID_SC_MENU_START + 24 ) -#define HID_SCMENU_ANCHOR ( HID_SC_MENU_START + 25 ) -#define HID_SCMENU_SENDTO ( HID_SC_MENU_START + 26 ) -#define HID_SCMENU_CHANGES ( HID_SC_MENU_START + 27 ) - -#define HID_SC_FAP_BTN_FX1 ( HID_SC_MENU_START + 28 ) -#define HID_SC_FAP_BTN_FX2 ( HID_SC_MENU_START + 29 ) -#define HID_SC_FAP_BTN_FX3 ( HID_SC_MENU_START + 30 ) -#define HID_SC_FAP_BTN_FX4 ( HID_SC_MENU_START + 31 ) -#define HID_SC_FAP_BTN_REF1 ( HID_SC_MENU_START + 32 ) -#define HID_SC_FAP_BTN_REF2 ( HID_SC_MENU_START + 33 ) -#define HID_SC_FAP_BTN_REF3 ( HID_SC_MENU_START + 34 ) -#define HID_SC_FAP_BTN_REF4 ( HID_SC_MENU_START + 35 ) -#define HID_SC_FAP_FORMULA ( HID_SC_MENU_START + 36 ) - -#define HID_SC_SORT_ACTION ( HID_SC_MENU_START + 37 ) -#define HID_SC_SORT_AUTHOR ( HID_SC_MENU_START + 38 ) -#define HID_SC_SORT_DATE ( HID_SC_MENU_START + 39 ) -#define HID_SC_SORT_COMMENT ( HID_SC_MENU_START + 40 ) -#define HID_SORT_POSITION ( HID_SC_MENU_START + 41 ) -#define HID_SC_CHANGES_COMMENT ( HID_SC_MENU_START + 42 ) -#define HID_SC_FUNCTIONLIST ( HID_SC_MENU_START + 43 ) -#define HID_SCPAGE_OPTLOAD ( HID_SC_MENU_START + 44 ) -#define HID_PASSWD_TABLE ( HID_SC_MENU_START + 45 ) -#define HID_PASSWD_DOC ( HID_SC_MENU_START + 46 ) - -#define HID_DATAPILOT_TYPE ( HID_SC_MENU_START + 47 ) -#define HID_DATAPILOT_DATABASE ( HID_SC_MENU_START + 48 ) -#define HID_DATAPILOT_SERVICE ( HID_SC_MENU_START + 49 ) +#define HID_SCMENU_EDIT "SC_HID_SCMENU_EDIT" +#define HID_SCMENU_FILL "SC_HID_SCMENU_FILL" +#define HID_SCMENU_DELBREAK "SC_HID_SCMENU_DELBREAK" +#define HID_SCMENU_VIEW "SC_HID_SCMENU_VIEW" +#define HID_SCMENU_TOOLBARS "SC_HID_SCMENU_TOOLBARS" +#define HID_SCMENU_INSERT "SC_HID_SCMENU_INSERT" +#define HID_SCMENU_INSBREAK "SC_HID_SCMENU_INSBREAK" +#define HID_SCMENU_NAME "SC_HID_SCMENU_NAME" +#define HID_SCMENU_GRAPHIC "SC_HID_SCMENU_GRAPHIC" +#define HID_SCMENU_DATA "SC_HID_SCMENU_DATA" +#define HID_SCMENU_FILTER "SC_HID_SCMENU_FILTER" +#define HID_SCMENU_OUTLINE "SC_HID_SCMENU_OUTLINE" +#define HID_SCMENU_PIVOT "SC_HID_SCMENU_PIVOT" +#define HID_SCMENU_EXTRA "SC_HID_SCMENU_EXTRA" +#define HID_SCMENU_SPELLING "SC_HID_SCMENU_SPELLING" +#define HID_SCMENU_AUDIT "SC_HID_SCMENU_AUDIT" +#define HID_SCMENU_PROTECT "SC_HID_SCMENU_PROTECT" +#define HID_SCMENU_CELLCONT "SC_HID_SCMENU_CELLCONT" +#define HID_SCMENU_ROW "SC_HID_SCMENU_ROW" +#define HID_SCMENU_COL "SC_HID_SCMENU_COL" +#define HID_SCMENU_TAB "SC_HID_SCMENU_TAB" +#define HID_SCMENU_MERGE "SC_HID_SCMENU_MERGE" +#define HID_SCMENU_AREA "SC_HID_SCMENU_AREA" +#define HID_SCMENU_OBJMIRROR "SC_HID_SCMENU_OBJMIRROR" +#define HID_SCMENU_OBJARRANGE "SC_HID_SCMENU_OBJARRANGE" +#define HID_SCMENU_ANCHOR "SC_HID_SCMENU_ANCHOR" +#define HID_SCMENU_SENDTO "SC_HID_SCMENU_SENDTO" +#define HID_SCMENU_CHANGES "SC_HID_SCMENU_CHANGES" + +#define HID_SC_FAP_BTN_FX1 "SC_HID_SC_FAP_BTN_FX1" +#define HID_SC_FAP_BTN_FX2 "SC_HID_SC_FAP_BTN_FX2" +#define HID_SC_FAP_BTN_FX3 "SC_HID_SC_FAP_BTN_FX3" +#define HID_SC_FAP_BTN_FX4 "SC_HID_SC_FAP_BTN_FX4" +#define HID_SC_FAP_BTN_REF1 "SC_HID_SC_FAP_BTN_REF1" +#define HID_SC_FAP_BTN_REF2 "SC_HID_SC_FAP_BTN_REF2" +#define HID_SC_FAP_BTN_REF3 "SC_HID_SC_FAP_BTN_REF3" +#define HID_SC_FAP_BTN_REF4 "SC_HID_SC_FAP_BTN_REF4" +#define HID_SC_FAP_FORMULA "SC_HID_SC_FAP_FORMULA" + +#define HID_SC_SORT_ACTION "SC_HID_SC_SORT_ACTION" +#define HID_SC_SORT_AUTHOR "SC_HID_SC_SORT_AUTHOR" +#define HID_SC_SORT_DATE "SC_HID_SC_SORT_DATE" +#define HID_SC_SORT_COMMENT "SC_HID_SC_SORT_COMMENT" +#define HID_SORT_POSITION "SC_HID_SORT_POSITION" +#define HID_SC_CHANGES_COMMENT "SC_HID_SC_CHANGES_COMMENT" +#define HID_SC_FUNCTIONLIST "SC_HID_SC_FUNCTIONLIST" +#define HID_SCPAGE_OPTLOAD "SC_HID_SCPAGE_OPTLOAD" +#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" +#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" + +#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE" +#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE" +#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE" // Other help IDs (max.70) --------------------------------------------------- -#define HID_SCDLG_LINKAREAURL ( HID_SC_OTHER_START ) -#define HID_SCMENU_EDIT_TABLE ( HID_SC_OTHER_START + 1 ) +#define HID_SCDLG_LINKAREAURL "SC_HID_SCDLG_LINKAREAURL" +#define HID_SCMENU_EDIT_TABLE "SC_HID_SCMENU_EDIT_TABLE" -#define HID_SELECTTABLES ( HID_SC_OTHER_START + 2 ) -#define HID_SC_REPLCELLSWARN ( HID_SC_OTHER_START + 3 ) +#define HID_SELECTTABLES "SC_HID_SELECTTABLES" +#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN" // data pilot layout dialog -#define HID_SC_DPLAY_PAGE ( HID_SC_OTHER_START + 4 ) -#define HID_SC_DPLAY_COLUMN ( HID_SC_OTHER_START + 5 ) -#define HID_SC_DPLAY_ROW ( HID_SC_OTHER_START + 6 ) -#define HID_SC_DPLAY_DATA ( HID_SC_OTHER_START + 7 ) -#define HID_SC_DPLAY_SELECT ( HID_SC_OTHER_START + 8 ) - -#define HID_SC_DRAW_RENAME ( HID_SC_OTHER_START + 9 ) - -#define HID_SC_DPDATAFIELD ( HID_SC_OTHER_START + 10 ) -#define HID_SC_DPSUBT_OPT ( HID_SC_OTHER_START + 11 ) -#define HID_SC_DPSUBT_HIDE ( HID_SC_OTHER_START + 12 ) -#define HID_SC_DPNUMGROUP ( HID_SC_OTHER_START + 13 ) -#define HID_SC_DPDATEGROUP ( HID_SC_OTHER_START + 14 ) -#define HID_SC_DPDATEGROUP_LB ( HID_SC_OTHER_START + 15 ) -#define HID_SC_DPSHOWDETAIL ( HID_SC_OTHER_START + 16 ) +#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE" +#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN" +#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW" +#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA" +#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT" + +#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" + +#define HID_SC_DPDATAFIELD "SC_HID_SC_DPDATAFIELD" +#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" +#define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE" +#define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP" +#define HID_SC_DPDATEGROUP "SC_HID_SC_DPDATEGROUP" +#define HID_SC_DPDATEGROUP_LB "SC_HID_SC_DPDATEGROUP_LB" +#define HID_SC_DPSHOWDETAIL "SC_HID_SC_DPSHOWDETAIL" // #i68101# -#define HID_SC_TITLE_DESCRIPTION_OBJECT ( HID_SC_OTHER_START + 17 ) +#define HID_SC_TITLE_DESCRIPTION_OBJECT "SC_HID_SC_TITLE_DESCRIPTION_OBJECT" -#define HID_SC_SOLVEROPTIONS ( HID_SC_OTHER_START + 18 ) -#define HID_SC_SOLVEROPTIONS_LB ( HID_SC_OTHER_START + 19 ) -#define HID_SC_SOLVER_INTEGER ( HID_SC_OTHER_START + 20 ) -#define HID_SC_SOLVER_DOUBLE ( HID_SC_OTHER_START + 21 ) -#define HID_SC_SOLVER_PROGRESS ( HID_SC_OTHER_START + 22 ) -#define HID_SC_SOLVER_NOSOLUTION ( HID_SC_OTHER_START + 23 ) -#define HID_SC_SOLVER_SUCCESS ( HID_SC_OTHER_START + 24 ) +#define HID_SC_SOLVEROPTIONS "SC_HID_SC_SOLVEROPTIONS" +#define HID_SC_SOLVEROPTIONS_LB "SC_HID_SC_SOLVEROPTIONS_LB" +#define HID_SC_SOLVER_INTEGER "SC_HID_SC_SOLVER_INTEGER" +#define HID_SC_SOLVER_DOUBLE "SC_HID_SC_SOLVER_DOUBLE" +#define HID_SC_SOLVER_PROGRESS "SC_HID_SC_SOLVER_PROGRESS" +#define HID_SC_SOLVER_NOSOLUTION "SC_HID_SC_SOLVER_NOSOLUTION" +#define HID_SC_SOLVER_SUCCESS "SC_HID_SC_SOLVER_SUCCESS" -#define HID_SCDLG_CONFLICTS ( HID_SC_OTHER_START + 25 ) +#define HID_SCDLG_CONFLICTS "SC_HID_SCDLG_CONFLICTS" -#define HID_SC_HF_HL_DEFINED ( HID_SC_OTHER_START + 26 ) -#define HID_SC_HF_HR_DEFINED ( HID_SC_OTHER_START + 27 ) -#define HID_SC_HF_FL_DEFINED ( HID_SC_OTHER_START + 28 ) -#define HID_SC_HF_FR_DEFINED ( HID_SC_OTHER_START + 29 ) +#define HID_SC_HF_HL_DEFINED "SC_HID_SC_HF_HL_DEFINED" +#define HID_SC_HF_HR_DEFINED "SC_HID_SC_HF_HR_DEFINED" +#define HID_SC_HF_FL_DEFINED "SC_HID_SC_HF_FL_DEFINED" +#define HID_SC_HF_FR_DEFINED "SC_HID_SC_HF_FR_DEFINED" // Analysis Addin Functions (max.120) ---------------------------------------- -#define HID_AAI_FUNC_WORKDAY ( HID_SC_AAI_FUNCS_START ) -#define HID_AAI_FUNC_YEARFRAC ( HID_SC_AAI_FUNCS_START + 1 ) -#define HID_AAI_FUNC_EDATE ( HID_SC_AAI_FUNCS_START + 2 ) -#define HID_AAI_FUNC_WEEKNUM ( HID_SC_AAI_FUNCS_START + 3 ) -#define HID_AAI_FUNC_EOMONTH ( HID_SC_AAI_FUNCS_START + 4 ) -#define HID_AAI_FUNC_NETWORKDAYS ( HID_SC_AAI_FUNCS_START + 5 ) -#define HID_AAI_FUNC_AMORDEGRC ( HID_SC_AAI_FUNCS_START + 6 ) -#define HID_AAI_FUNC_AMORLINC ( HID_SC_AAI_FUNCS_START + 7 ) -#define HID_AAI_FUNC_ACCRINT ( HID_SC_AAI_FUNCS_START + 8 ) -#define HID_AAI_FUNC_ACCRINTM ( HID_SC_AAI_FUNCS_START + 9 ) -#define HID_AAI_FUNC_RECEIVED ( HID_SC_AAI_FUNCS_START + 10 ) -#define HID_AAI_FUNC_DISC ( HID_SC_AAI_FUNCS_START + 11 ) -#define HID_AAI_FUNC_DURATION ( HID_SC_AAI_FUNCS_START + 12 ) -#define HID_AAI_FUNC_EFFECT ( HID_SC_AAI_FUNCS_START + 13 ) -#define HID_AAI_FUNC_CUMPRINC ( HID_SC_AAI_FUNCS_START + 14 ) -#define HID_AAI_FUNC_CUMIPMT ( HID_SC_AAI_FUNCS_START + 15 ) -#define HID_AAI_FUNC_PRICE ( HID_SC_AAI_FUNCS_START + 16 ) -#define HID_AAI_FUNC_PRICEDISC ( HID_SC_AAI_FUNCS_START + 17 ) -#define HID_AAI_FUNC_PRICEMAT ( HID_SC_AAI_FUNCS_START + 18 ) -#define HID_AAI_FUNC_MDURATION ( HID_SC_AAI_FUNCS_START + 19 ) -#define HID_AAI_FUNC_NOMINAL ( HID_SC_AAI_FUNCS_START + 20 ) -#define HID_AAI_FUNC_DOLLARFR ( HID_SC_AAI_FUNCS_START + 21 ) -#define HID_AAI_FUNC_DOLLARDE ( HID_SC_AAI_FUNCS_START + 22 ) -#define HID_AAI_FUNC_YIELD ( HID_SC_AAI_FUNCS_START + 23 ) -#define HID_AAI_FUNC_YIELDDISC ( HID_SC_AAI_FUNCS_START + 24 ) -#define HID_AAI_FUNC_YIELDMAT ( HID_SC_AAI_FUNCS_START + 25 ) -#define HID_AAI_FUNC_TBILLEQ ( HID_SC_AAI_FUNCS_START + 26 ) -#define HID_AAI_FUNC_TBILLPRICE ( HID_SC_AAI_FUNCS_START + 27 ) -#define HID_AAI_FUNC_TBILLYIELD ( HID_SC_AAI_FUNCS_START + 28 ) -#define HID_AAI_FUNC_ODDFPRICE ( HID_SC_AAI_FUNCS_START + 29 ) -#define HID_AAI_FUNC_ODDFYIELD ( HID_SC_AAI_FUNCS_START + 30 ) -#define HID_AAI_FUNC_ODDLPRICE ( HID_SC_AAI_FUNCS_START + 31 ) -#define HID_AAI_FUNC_ODDLYIELD ( HID_SC_AAI_FUNCS_START + 32 ) -#define HID_AAI_FUNC_XIRR ( HID_SC_AAI_FUNCS_START + 33 ) -#define HID_AAI_FUNC_XNPV ( HID_SC_AAI_FUNCS_START + 34 ) -#define HID_AAI_FUNC_INTRATE ( HID_SC_AAI_FUNCS_START + 35 ) -#define HID_AAI_FUNC_COUPNCD ( HID_SC_AAI_FUNCS_START + 36 ) -#define HID_AAI_FUNC_COUPDAYS ( HID_SC_AAI_FUNCS_START + 37 ) -#define HID_AAI_FUNC_COUPDAYSNC ( HID_SC_AAI_FUNCS_START + 38 ) -#define HID_AAI_FUNC_COUPDAYBS ( HID_SC_AAI_FUNCS_START + 39 ) -#define HID_AAI_FUNC_COUPPCD ( HID_SC_AAI_FUNCS_START + 40 ) -#define HID_AAI_FUNC_COUPNUM ( HID_SC_AAI_FUNCS_START + 41 ) -#define HID_AAI_FUNC_FVSCHEDULE ( HID_SC_AAI_FUNCS_START + 42 ) -#define HID_AAI_FUNC_ISEVEN ( HID_SC_AAI_FUNCS_START + 43 ) -#define HID_AAI_FUNC_ISODD ( HID_SC_AAI_FUNCS_START + 44 ) -#define HID_AAI_FUNC_GCD ( HID_SC_AAI_FUNCS_START + 45 ) -#define HID_AAI_FUNC_LCM ( HID_SC_AAI_FUNCS_START + 46 ) -#define HID_AAI_FUNC_MULTINOMIAL ( HID_SC_AAI_FUNCS_START + 47 ) -#define HID_AAI_FUNC_SERIESSUM ( HID_SC_AAI_FUNCS_START + 48 ) -#define HID_AAI_FUNC_QUOTIENT ( HID_SC_AAI_FUNCS_START + 49 ) -#define HID_AAI_FUNC_MROUND ( HID_SC_AAI_FUNCS_START + 50 ) -#define HID_AAI_FUNC_SQRTPI ( HID_SC_AAI_FUNCS_START + 51 ) -#define HID_AAI_FUNC_RANDBETWEEN ( HID_SC_AAI_FUNCS_START + 52 ) -#define HID_AAI_FUNC_BESSELI ( HID_SC_AAI_FUNCS_START + 53 ) -#define HID_AAI_FUNC_BESSELJ ( HID_SC_AAI_FUNCS_START + 54 ) -#define HID_AAI_FUNC_BESSELK ( HID_SC_AAI_FUNCS_START + 55 ) -#define HID_AAI_FUNC_BESSELY ( HID_SC_AAI_FUNCS_START + 56 ) -#define HID_AAI_FUNC_BIN2DEC ( HID_SC_AAI_FUNCS_START + 57 ) -#define HID_AAI_FUNC_BIN2HEX ( HID_SC_AAI_FUNCS_START + 58 ) -#define HID_AAI_FUNC_BIN2OCT ( HID_SC_AAI_FUNCS_START + 59 ) -#define HID_AAI_FUNC_DELTA ( HID_SC_AAI_FUNCS_START + 60 ) -#define HID_AAI_FUNC_DEC2BIN ( HID_SC_AAI_FUNCS_START + 61 ) -#define HID_AAI_FUNC_DEC2HEX ( HID_SC_AAI_FUNCS_START + 62 ) -#define HID_AAI_FUNC_DEC2OCT ( HID_SC_AAI_FUNCS_START + 63 ) -#define HID_AAI_FUNC_ERF ( HID_SC_AAI_FUNCS_START + 64 ) -#define HID_AAI_FUNC_ERFC ( HID_SC_AAI_FUNCS_START + 65 ) -#define HID_AAI_FUNC_GESTEP ( HID_SC_AAI_FUNCS_START + 66 ) -#define HID_AAI_FUNC_HEX2BIN ( HID_SC_AAI_FUNCS_START + 67 ) -#define HID_AAI_FUNC_HEX2DEC ( HID_SC_AAI_FUNCS_START + 68 ) -#define HID_AAI_FUNC_HEX2OCT ( HID_SC_AAI_FUNCS_START + 69 ) -#define HID_AAI_FUNC_IMABS ( HID_SC_AAI_FUNCS_START + 70 ) -#define HID_AAI_FUNC_IMAGINARY ( HID_SC_AAI_FUNCS_START + 71 ) -#define HID_AAI_FUNC_IMPOWER ( HID_SC_AAI_FUNCS_START + 72 ) -#define HID_AAI_FUNC_IMARGUMENT ( HID_SC_AAI_FUNCS_START + 73 ) -#define HID_AAI_FUNC_IMCOS ( HID_SC_AAI_FUNCS_START + 74 ) -#define HID_AAI_FUNC_IMDIV ( HID_SC_AAI_FUNCS_START + 75 ) -#define HID_AAI_FUNC_IMEXP ( HID_SC_AAI_FUNCS_START + 76 ) -#define HID_AAI_FUNC_IMCONJUGATE ( HID_SC_AAI_FUNCS_START + 77 ) -#define HID_AAI_FUNC_IMLN ( HID_SC_AAI_FUNCS_START + 78 ) -#define HID_AAI_FUNC_IMLOG10 ( HID_SC_AAI_FUNCS_START + 79 ) -#define HID_AAI_FUNC_IMLOG2 ( HID_SC_AAI_FUNCS_START + 80 ) -#define HID_AAI_FUNC_IMPRODUCT ( HID_SC_AAI_FUNCS_START + 81 ) -#define HID_AAI_FUNC_IMREAL ( HID_SC_AAI_FUNCS_START + 82 ) -#define HID_AAI_FUNC_IMSIN ( HID_SC_AAI_FUNCS_START + 83 ) -#define HID_AAI_FUNC_IMSUB ( HID_SC_AAI_FUNCS_START + 84 ) -#define HID_AAI_FUNC_IMSUM ( HID_SC_AAI_FUNCS_START + 85 ) -#define HID_AAI_FUNC_IMSQRT ( HID_SC_AAI_FUNCS_START + 86 ) -#define HID_AAI_FUNC_COMPLEX ( HID_SC_AAI_FUNCS_START + 87 ) -#define HID_AAI_FUNC_OCT2BIN ( HID_SC_AAI_FUNCS_START + 88 ) -#define HID_AAI_FUNC_OCT2DEZ ( HID_SC_AAI_FUNCS_START + 89 ) -#define HID_AAI_FUNC_OCT2HEX ( HID_SC_AAI_FUNCS_START + 90 ) -#define HID_AAI_FUNC_CONVERT ( HID_SC_AAI_FUNCS_START + 91 ) -#define HID_AAI_FUNC_FACTDOUBLE ( HID_SC_AAI_FUNCS_START + 92 ) +#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY" +#define HID_AAI_FUNC_YEARFRAC "SC_HID_AAI_FUNC_YEARFRAC" +#define HID_AAI_FUNC_EDATE "SC_HID_AAI_FUNC_EDATE" +#define HID_AAI_FUNC_WEEKNUM "SC_HID_AAI_FUNC_WEEKNUM" +#define HID_AAI_FUNC_EOMONTH "SC_HID_AAI_FUNC_EOMONTH" +#define HID_AAI_FUNC_NETWORKDAYS "SC_HID_AAI_FUNC_NETWORKDAYS" +#define HID_AAI_FUNC_AMORDEGRC "SC_HID_AAI_FUNC_AMORDEGRC" +#define HID_AAI_FUNC_AMORLINC "SC_HID_AAI_FUNC_AMORLINC" +#define HID_AAI_FUNC_ACCRINT "SC_HID_AAI_FUNC_ACCRINT" +#define HID_AAI_FUNC_ACCRINTM "SC_HID_AAI_FUNC_ACCRINTM" +#define HID_AAI_FUNC_RECEIVED "SC_HID_AAI_FUNC_RECEIVED" +#define HID_AAI_FUNC_DISC "SC_HID_AAI_FUNC_DISC" +#define HID_AAI_FUNC_DURATION "SC_HID_AAI_FUNC_DURATION" +#define HID_AAI_FUNC_EFFECT "SC_HID_AAI_FUNC_EFFECT" +#define HID_AAI_FUNC_CUMPRINC "SC_HID_AAI_FUNC_CUMPRINC" +#define HID_AAI_FUNC_CUMIPMT "SC_HID_AAI_FUNC_CUMIPMT" +#define HID_AAI_FUNC_PRICE "SC_HID_AAI_FUNC_PRICE" +#define HID_AAI_FUNC_PRICEDISC "SC_HID_AAI_FUNC_PRICEDISC" +#define HID_AAI_FUNC_PRICEMAT "SC_HID_AAI_FUNC_PRICEMAT" +#define HID_AAI_FUNC_MDURATION "SC_HID_AAI_FUNC_MDURATION" +#define HID_AAI_FUNC_NOMINAL "SC_HID_AAI_FUNC_NOMINAL" +#define HID_AAI_FUNC_DOLLARFR "SC_HID_AAI_FUNC_DOLLARFR" +#define HID_AAI_FUNC_DOLLARDE "SC_HID_AAI_FUNC_DOLLARDE" +#define HID_AAI_FUNC_YIELD "SC_HID_AAI_FUNC_YIELD" +#define HID_AAI_FUNC_YIELDDISC "SC_HID_AAI_FUNC_YIELDDISC" +#define HID_AAI_FUNC_YIELDMAT "SC_HID_AAI_FUNC_YIELDMAT" +#define HID_AAI_FUNC_TBILLEQ "SC_HID_AAI_FUNC_TBILLEQ" +#define HID_AAI_FUNC_TBILLPRICE "SC_HID_AAI_FUNC_TBILLPRICE" +#define HID_AAI_FUNC_TBILLYIELD "SC_HID_AAI_FUNC_TBILLYIELD" +#define HID_AAI_FUNC_ODDFPRICE "SC_HID_AAI_FUNC_ODDFPRICE" +#define HID_AAI_FUNC_ODDFYIELD "SC_HID_AAI_FUNC_ODDFYIELD" +#define HID_AAI_FUNC_ODDLPRICE "SC_HID_AAI_FUNC_ODDLPRICE" +#define HID_AAI_FUNC_ODDLYIELD "SC_HID_AAI_FUNC_ODDLYIELD" +#define HID_AAI_FUNC_XIRR "SC_HID_AAI_FUNC_XIRR" +#define HID_AAI_FUNC_XNPV "SC_HID_AAI_FUNC_XNPV" +#define HID_AAI_FUNC_INTRATE "SC_HID_AAI_FUNC_INTRATE" +#define HID_AAI_FUNC_COUPNCD "SC_HID_AAI_FUNC_COUPNCD" +#define HID_AAI_FUNC_COUPDAYS "SC_HID_AAI_FUNC_COUPDAYS" +#define HID_AAI_FUNC_COUPDAYSNC "SC_HID_AAI_FUNC_COUPDAYSNC" +#define HID_AAI_FUNC_COUPDAYBS "SC_HID_AAI_FUNC_COUPDAYBS" +#define HID_AAI_FUNC_COUPPCD "SC_HID_AAI_FUNC_COUPPCD" +#define HID_AAI_FUNC_COUPNUM "SC_HID_AAI_FUNC_COUPNUM" +#define HID_AAI_FUNC_FVSCHEDULE "SC_HID_AAI_FUNC_FVSCHEDULE" +#define HID_AAI_FUNC_ISEVEN "SC_HID_AAI_FUNC_ISEVEN" +#define HID_AAI_FUNC_ISODD "SC_HID_AAI_FUNC_ISODD" +#define HID_AAI_FUNC_GCD "SC_HID_AAI_FUNC_GCD" +#define HID_AAI_FUNC_LCM "SC_HID_AAI_FUNC_LCM" +#define HID_AAI_FUNC_MULTINOMIAL "SC_HID_AAI_FUNC_MULTINOMIAL" +#define HID_AAI_FUNC_SERIESSUM "SC_HID_AAI_FUNC_SERIESSUM" +#define HID_AAI_FUNC_QUOTIENT "SC_HID_AAI_FUNC_QUOTIENT" +#define HID_AAI_FUNC_MROUND "SC_HID_AAI_FUNC_MROUND" +#define HID_AAI_FUNC_SQRTPI "SC_HID_AAI_FUNC_SQRTPI" +#define HID_AAI_FUNC_RANDBETWEEN "SC_HID_AAI_FUNC_RANDBETWEEN" +#define HID_AAI_FUNC_BESSELI "SC_HID_AAI_FUNC_BESSELI" +#define HID_AAI_FUNC_BESSELJ "SC_HID_AAI_FUNC_BESSELJ" +#define HID_AAI_FUNC_BESSELK "SC_HID_AAI_FUNC_BESSELK" +#define HID_AAI_FUNC_BESSELY "SC_HID_AAI_FUNC_BESSELY" +#define HID_AAI_FUNC_BIN2DEC "SC_HID_AAI_FUNC_BIN2DEC" +#define HID_AAI_FUNC_BIN2HEX "SC_HID_AAI_FUNC_BIN2HEX" +#define HID_AAI_FUNC_BIN2OCT "SC_HID_AAI_FUNC_BIN2OCT" +#define HID_AAI_FUNC_DELTA "SC_HID_AAI_FUNC_DELTA" +#define HID_AAI_FUNC_DEC2BIN "SC_HID_AAI_FUNC_DEC2BIN" +#define HID_AAI_FUNC_DEC2HEX "SC_HID_AAI_FUNC_DEC2HEX" +#define HID_AAI_FUNC_DEC2OCT "SC_HID_AAI_FUNC_DEC2OCT" +#define HID_AAI_FUNC_ERF "SC_HID_AAI_FUNC_ERF" +#define HID_AAI_FUNC_ERFC "SC_HID_AAI_FUNC_ERFC" +#define HID_AAI_FUNC_GESTEP "SC_HID_AAI_FUNC_GESTEP" +#define HID_AAI_FUNC_HEX2BIN "SC_HID_AAI_FUNC_HEX2BIN" +#define HID_AAI_FUNC_HEX2DEC "SC_HID_AAI_FUNC_HEX2DEC" +#define HID_AAI_FUNC_HEX2OCT "SC_HID_AAI_FUNC_HEX2OCT" +#define HID_AAI_FUNC_IMABS "SC_HID_AAI_FUNC_IMABS" +#define HID_AAI_FUNC_IMAGINARY "SC_HID_AAI_FUNC_IMAGINARY" +#define HID_AAI_FUNC_IMPOWER "SC_HID_AAI_FUNC_IMPOWER" +#define HID_AAI_FUNC_IMARGUMENT "SC_HID_AAI_FUNC_IMARGUMENT" +#define HID_AAI_FUNC_IMCOS "SC_HID_AAI_FUNC_IMCOS" +#define HID_AAI_FUNC_IMDIV "SC_HID_AAI_FUNC_IMDIV" +#define HID_AAI_FUNC_IMEXP "SC_HID_AAI_FUNC_IMEXP" +#define HID_AAI_FUNC_IMCONJUGATE "SC_HID_AAI_FUNC_IMCONJUGATE" +#define HID_AAI_FUNC_IMLN "SC_HID_AAI_FUNC_IMLN" +#define HID_AAI_FUNC_IMLOG10 "SC_HID_AAI_FUNC_IMLOG10" +#define HID_AAI_FUNC_IMLOG2 "SC_HID_AAI_FUNC_IMLOG2" +#define HID_AAI_FUNC_IMPRODUCT "SC_HID_AAI_FUNC_IMPRODUCT" +#define HID_AAI_FUNC_IMREAL "SC_HID_AAI_FUNC_IMREAL" +#define HID_AAI_FUNC_IMSIN "SC_HID_AAI_FUNC_IMSIN" +#define HID_AAI_FUNC_IMSUB "SC_HID_AAI_FUNC_IMSUB" +#define HID_AAI_FUNC_IMSUM "SC_HID_AAI_FUNC_IMSUM" +#define HID_AAI_FUNC_IMSQRT "SC_HID_AAI_FUNC_IMSQRT" +#define HID_AAI_FUNC_COMPLEX "SC_HID_AAI_FUNC_COMPLEX" +#define HID_AAI_FUNC_OCT2BIN "SC_HID_AAI_FUNC_OCT2BIN" +#define HID_AAI_FUNC_OCT2DEZ "SC_HID_AAI_FUNC_OCT2DEZ" +#define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" +#define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" +#define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" // DateFunc Addin Functions (max.20) ----------------------------------------- -#define HID_DAI_FUNC_DAYSINMONTH ( HID_SC_DAI_FUNCS_START ) -#define HID_DAI_FUNC_DAYSINYEAR ( HID_SC_DAI_FUNCS_START + 1 ) -#define HID_DAI_FUNC_WEEKSINYEAR ( HID_SC_DAI_FUNCS_START + 2 ) -#define HID_DAI_FUNC_DIFFMONTHS ( HID_SC_DAI_FUNCS_START + 3 ) -#define HID_DAI_FUNC_DIFFWEEKS ( HID_SC_DAI_FUNCS_START + 4 ) -#define HID_DAI_FUNC_DIFFYEARS ( HID_SC_DAI_FUNCS_START + 5 ) -#define HID_DAI_FUNC_ROT13 ( HID_SC_DAI_FUNCS_START + 6 ) +#define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" +#define HID_DAI_FUNC_DAYSINYEAR "SC_HID_DAI_FUNC_DAYSINYEAR" +#define HID_DAI_FUNC_WEEKSINYEAR "SC_HID_DAI_FUNC_WEEKSINYEAR" +#define HID_DAI_FUNC_DIFFMONTHS "SC_HID_DAI_FUNC_DIFFMONTHS" +#define HID_DAI_FUNC_DIFFWEEKS "SC_HID_DAI_FUNC_DIFFWEEKS" +#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" +#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" + +#define HID_SCPAGE_OPREDLINBE_FT_CONTENT "SC_HID_SCPAGE_OPREDLINBE_FT_CONTENT" +#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE" +#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN" +#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE" + // Ende Hilfe IDs ------------------------------------------------------------ // --------------------------------------------------------------------------- diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index d3c19bb539d5..d91ada912058 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -275,7 +275,7 @@ class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg public: virtual void Insert( const String& rString, BOOL bSelected ) = 0; virtual USHORT GetSelectEntryCount() const = 0; - virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ) = 0; + virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ) = 0; virtual String GetSelectEntry(USHORT nPos) const = 0; virtual USHORT GetSelectEntryPos(USHORT nPos) const = 0; }; @@ -433,7 +433,7 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId , + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, int nId ) = 0; virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h new file mode 100644 index 000000000000..7a1581f96627 --- /dev/null +++ b/sc/inc/sccommands.h @@ -0,0 +1,333 @@ +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SC_SCCOMMANDS_HRC
+#define SC_SCCOMMANDS_HRC
+
+#define CMD_FID_CHG_ACCEPT ".uno:AcceptChanges"
+#define CMD_SID_OLE_ACTIVATE ".uno:ActivateOLE"
+#define CMD_SID_TABLE_ACTIVATE ".uno:ActivateTable"
+#define CMD_SID_SC_ACTIVECELL ".uno:ActiveCell"
+#define CMD_SID_SC_ACTIVETAB ".uno:ActiveTable"
+#define CMD_FID_TAB_APPEND ".uno:Add"
+#define CMD_SID_CHART_ADDSOURCE ".uno:AddChartData"
+#define CMD_SID_ADD_IN_MANAGER ".uno:AddInManager"
+#define CMD_SID_ADD_PRINTAREA ".uno:AddPrintArea"
+#define CMD_SID_RANGE_ADDRESS ".uno:Address"
+#define CMD_FID_ADJUST_PRINTZOOM ".uno:AdjustPrintZoom"
+#define CMD_SID_ALIGNBLOCK ".uno:AlignBlock"
+#define CMD_SID_ALIGNBOTTOM ".uno:AlignBottom"
+#define CMD_SID_ALIGNCENTERHOR ".uno:AlignHorizontalCenter"
+#define CMD_SID_ALIGNLEFT ".uno:AlignLeft"
+#define CMD_SID_ALIGNRIGHT ".uno:AlignRight"
+#define CMD_SID_ALIGNTOP ".uno:AlignTop"
+#define CMD_SID_ALIGNCENTERVER ".uno:AlignVCenter"
+#define CMD_FID_APPLY_NAME ".uno:ApplyNames"
+#define CMD_SID_DETECTIVE_FILLMODE ".uno:AuditingFillMode"
+#define CMD_FID_AUTOCOMPLETE ".uno:AutoComplete"
+#define CMD_FID_FILL_AUTO ".uno:AutoFill"
+#define CMD_FID_AUTO_CALC ".uno:AutomaticCalculation"
+#define CMD_SID_AUTO_OUTLINE ".uno:AutoOutline"
+#define CMD_SID_DETECTIVE_AUTO ".uno:AutoRefreshArrows"
+#define CMD_SID_AUTO_STYLE ".uno:AutoStyle"
+#define CMD_FID_RECALC ".uno:Calculate"
+#define CMD_FID_HARD_RECALC ".uno:CalculateHard"
+#define CMD_SID_CANCEL ".uno:Cancel"
+#define CMD_SID_SC_CELLS ".uno:Cells"
+#define CMD_SID_SC_CELLTEXT ".uno:CellText"
+#define CMD_SID_CHART_SOURCE ".uno:ChangeChartData"
+#define CMD_SID_CHANGE_PRINTAREA ".uno:ChangePrintArea"
+#define CMD_SID_CHOOSE_DESIGN ".uno:ChooseDesign"
+#define CMD_SID_DETECTIVE_DEL_SUCC ".uno:ClearArrowDependents"
+#define CMD_SID_DETECTIVE_DEL_PRED ".uno:ClearArrowPrecedents"
+#define CMD_SID_DETECTIVE_DEL_ALL ".uno:ClearArrows"
+#define CMD_SID_DELETE_CONTENTS ".uno:ClearContents"
+#define CMD_SID_RANGE_COL ".uno:Column"
+#define CMD_FID_COL_WIDTH ".uno:ColumnWidth"
+#define CMD_FID_CHG_COMMENT ".uno:CommentChange"
+#define CMD_FID_CONDITIONAL_FORMAT ".uno:ConditionalFormat"
+#define CMD_SID_OPENDLG_CONDFRMT ".uno:ConditionalFormatDialog"
+#define CMD_SID_CONSOLIDATE ".uno:ConsolidateExec"
+#define CMD_FID_USE_NAME ".uno:CreateNames"
+#define CMD_SID_CREATE_SW_DRAWVIEW ".uno:CreateSWDrawView"
+#define CMD_SID_RANGE_REGION ".uno:CurrentRegion"
+#define CMD_SID_REFRESH_DBAREA ".uno:DataAreaRefresh"
+#define CMD_SID_OPENDLG_CONSOLIDATE ".uno:DataConsolidate"
+#define CMD_SID_OPENDLG_PIVOTTABLE ".uno:DataDataPilotRun"
+#define CMD_SID_AUTO_FILTER ".uno:DataFilterAutoFilter"
+#define CMD_SID_AUTOFILTER_HIDE ".uno:DataFilterHideAutoFilter"
+#define CMD_SID_UNFILTER ".uno:DataFilterRemoveFilter"
+#define CMD_SID_SPECIAL_FILTER ".uno:DataFilterSpecialFilter"
+#define CMD_SID_FILTER ".uno:DataFilterStandardFilter"
+#define CMD_SID_IMPORT_DATA ".uno:DataImport"
+#define CMD_SID_PIVOT_CREATE ".uno:DataPilotCreate"
+#define CMD_SID_PIVOT_TABLE ".uno:DataPilotExec"
+#define CMD_SID_PIVOT_GET ".uno:DataPilotTables"
+#define CMD_SID_REIMPORT_DATA ".uno:DataReImport"
+#define CMD_SID_DATA_SELECT ".uno:DataSelect"
+#define CMD_SID_SORT ".uno:DataSort"
+#define CMD_SID_SUBTOTALS ".uno:DataSubTotals"
+#define CMD_SID_OLE_DEACTIVATE ".uno:Deactivate"
+#define CMD_SID_DEFINE_DBNAME ".uno:DefineDBName"
+#define CMD_SID_DEFINE_COLROWNAMERANGES ".uno:DefineLabelRange"
+#define CMD_FID_DEFINE_NAME ".uno:DefineName"
+#define CMD_SID_DEFINE_PRINTAREA ".uno:DefinePrintArea"
+#define CMD_FID_DELETE_CELL ".uno:DeleteCell"
+#define CMD_FID_DEL_MANUALBREAKS ".uno:DeleteAllBreaks"
+#define CMD_FID_DEL_COLBRK ".uno:DeleteColumnbreak"
+#define CMD_SID_DEL_COLS ".uno:DeleteColumns"
+#define CMD_SID_PIVOT_KILL ".uno:DeletePivotTable"
+#define CMD_SID_DELETE_PRINTAREA ".uno:DeletePrintArea"
+#define CMD_FID_DEL_ROWBRK ".uno:DeleteRowbreak"
+#define CMD_SID_DEL_ROWS ".uno:DeleteRows"
+#define CMD_SID_DELETE_SCENARIO ".uno:DeleteScenario"
+#define CMD_SID_SELECT_NONE ".uno:Deselect"
+#define CMD_SID_DRAW_CHART ".uno:DrawChart"
+#define CMD_SID_DRAW_NOTEEDIT ".uno:DrawEditNote"
+#define CMD_SID_HFEDIT ".uno:EditHeaderAndFooter"
+#define CMD_SID_LINKS ".uno:EditLinks"
+#define CMD_SID_SC_EDIT_OBJECT ".uno:EditObject"
+#define CMD_SID_OPENDLG_EDIT_PRINTAREA ".uno:EditPrintArea"
+#define CMD_SID_EDIT_SCENARIO ".uno:EditScenario"
+#define CMD_SID_EURO_CONVERTER ".uno:EuroConverter"
+#define CMD_FID_FILL_TO_BOTTOM ".uno:FillDown"
+#define CMD_FID_FILL_TO_LEFT ".uno:FillLeft"
+#define CMD_SID_FILL_NONE ".uno:FillModeEnd"
+#define CMD_SID_FILL_DEL_PRED ".uno:FillModeRemovePredescessor"
+#define CMD_SID_FILL_DEL_SUCC ".uno:FillModeRemoveSuccessor"
+#define CMD_SID_FILL_SELECT ".uno:FillModeSelect"
+#define CMD_SID_FILL_ADD_PRED ".uno:FillModeTracePredescessor"
+#define CMD_SID_FILL_ADD_SUCC ".uno:FillModeTraceSuccessor"
+#define CMD_FID_FILL_TO_RIGHT ".uno:FillRight"
+#define CMD_FID_FILL_SERIES ".uno:FillSeries"
+#define CMD_FID_FILL_TAB ".uno:FillTable"
+#define CMD_FID_FILL_TO_TOP ".uno:FillUp"
+#define CMD_FID_FILTER_OK ".uno:FilterExecute"
+#define CMD_SID_PREVIEW_FIRST ".uno:FirstPage"
+#define CMD_FID_FOCUS_POSWND ".uno:FocusCellAddress"
+#define CMD_FID_CELL_FORMAT ".uno:FormatCellDialog"
+#define CMD_SID_RANGE_FORMULA ".uno:Formula"
+#define CMD_SID_WINDOW_FIX ".uno:FreezePanes"
+#define CMD_FID_FUNCTION_BOX ".uno:FunctionBox"
+#define CMD_SID_OPENDLG_FUNCTION ".uno:FunctionDialog"
+#define CMD_SID_SOLVE ".uno:GoalSeek"
+#define CMD_SID_OPENDLG_SOLVE ".uno:GoalSeekDialog"
+#define CMD_SID_OPENDLG_OPTSOLVER ".uno:SolverDialog"
+#define CMD_SID_VALIDITY_REFERENCE ".uno:ValidityReference"
+#define CMD_SID_CURSORBLKDOWN ".uno:GoDownToEndOfData"
+#define CMD_SID_CURSORBLKDOWN_SEL ".uno:GoDownToEndOfDataSel"
+#define CMD_SID_CURSORPAGELEFT_ ".uno:GoLeftBlock"
+#define CMD_SID_CURSORBLKLEFT ".uno:GoLeftToStartOfData"
+#define CMD_SID_CURSORBLKLEFT_SEL ".uno:GoLeftToStartOfDataSel"
+#define CMD_SID_CURSORPAGERIGHT_ ".uno:GoRightBlock"
+#define CMD_SID_CURSORPAGERIGHT_SEL ".uno:GoRightBlockSel"
+#define CMD_SID_CURSORBLKRIGHT ".uno:GoRightToEndOfData"
+#define CMD_SID_CURSORBLKRIGHT_SEL ".uno:GoRightToEndOfDataSel"
+#define CMD_SID_CURRENTCELL ".uno:GoToCell"
+#define CMD_SID_ALIGNCURSOR ".uno:GoToCurrentCell"
+#define CMD_SID_CURRENTDOC ".uno:GotoDocument"
+#define CMD_SID_CURRENTOBJECT ".uno:GoToObject"
+#define CMD_SID_CURSORBLKUP ".uno:GoUpToStartOfData"
+#define CMD_SID_CURSORBLKUP_SEL ".uno:GoUpToStartOfDataSel"
+#define CMD_FID_TABLE_HIDE ".uno:Hide"
+#define CMD_FID_COL_HIDE ".uno:HideColumn"
+#define CMD_FID_ROW_HIDE ".uno:HideRow"
+#define CMD_SID_H_ALIGNCELL ".uno:HorizontalAlignment"
+#define CMD_SID_ENABLE_HYPHENATION ".uno:Hyphenate"
+#define CMD_FID_INPUTLINE_BLOCK ".uno:InputLineBlock"
+#define CMD_FID_INPUTLINE_ENTER ".uno:InputLineEnter"
+#define CMD_FID_INPUTLINE_MATRIX ".uno:InputLineMatrix"
+#define CMD_SID_TBXCTL_INSCELLS ".uno:InsCellsCtrl"
+#define CMD_FID_INS_TABLE ".uno:Insert"
+#define CMD_FID_INS_TABLE_EXT ".uno:InsertSheetFromFile"
+#define CMD_FID_INS_CELL ".uno:InsertCell"
+#define CMD_FID_INS_CELLSDOWN ".uno:InsertCellsDown"
+#define CMD_FID_INS_CELLSRIGHT ".uno:InsertCellsRight"
+#define CMD_FID_INS_COLBRK ".uno:InsertColumnBreak"
+#define CMD_FID_INS_COLUMN ".uno:InsertColumns"
+#define CMD_FID_INS_CELL_CONTENTS ".uno:InsertContents"
+#define CMD_SID_TBXCTL_INSERT ".uno:InsertCtrl"
+#define CMD_SID_EXTERNAL_SOURCE ".uno:InsertExternalDataSource"
+#define CMD_FID_INSERT_FILE ".uno:InsertFile"
+#define CMD_SID_INS_FUNCTION ".uno:InsertFunction"
+#define CMD_SID_INSERT_MATRIX ".uno:InsertMatrix"
+#define CMD_FID_INSERT_NAME ".uno:InsertName"
+#define CMD_SID_INSERT_SIMAGE ".uno:InsertObjectStarImage"
+#define CMD_SID_INSERT_SMATH ".uno:InsertObjectStarMath"
+#define CMD_FID_INS_ROWBRK ".uno:InsertRowBreak"
+#define CMD_FID_INS_ROW ".uno:InsertRows"
+#define CMD_SID_TBXCTL_INSOBJ ".uno:InsObjCtrl"
+#define CMD_SID_CURSORENTERDOWN ".uno:JumpToNextCell"
+#define CMD_SID_NEXT_TABLE ".uno:JumpToNextTable"
+#define CMD_SID_NEXT_TABLE_SEL ".uno:JumpToNextTableSel"
+#define CMD_SID_NEXT_UNPROTECT ".uno:JumpToNextUnprotected"
+#define CMD_SID_CURSORENTERUP ".uno:JumpToPreviousCell"
+#define CMD_SID_PREV_UNPROTECT ".uno:JumpToPreviousUnprotected"
+#define CMD_SID_PREV_TABLE ".uno:JumpToPrevTable"
+#define CMD_SID_PREV_TABLE_SEL ".uno:JumpToPrevTableSel"
+#define CMD_SID_CURRENTTAB ".uno:JumpToTable"
+#define CMD_SID_PREVIEW_LAST ".uno:LastPage"
+#define CMD_FID_MERGE_ON ".uno:MergeCells"
+#define CMD_FID_MERGE_TOGGLE ".uno:ToggleMergeCells"
+#define CMD_SID_OBJECT_MIRROR ".uno:Mirror"
+#define CMD_FID_TAB_MOVE ".uno:Move"
+#define CMD_FID_TAB_RENAME ".uno:Name"
+#define CMD_SID_PREVIEW_NEXT ".uno:NextPage"
+#define CMD_SID_RANGE_NOTETEXT ".uno:NoteText"
+#define CMD_FID_NOTE_VISIBLE ".uno:NoteVisible"
+#define CMD_SID_DELETE_NOTE ".uno:DeleteNote"
+#define CMD_SID_NUMBER_FORMAT ".uno:NumberFormat"
+#define CMD_SID_NUMBER_CURRENCY ".uno:NumberFormatCurrency"
+#define CMD_SID_NUMBER_DATE ".uno:NumberFormatDate"
+#define CMD_SID_NUMBER_DECDEC ".uno:NumberFormatDecDecimals"
+#define CMD_SID_NUMBER_TWODEC ".uno:NumberFormatDecimal"
+#define CMD_SID_NUMBER_INCDEC ".uno:NumberFormatIncDecimals"
+#define CMD_SID_NUMBER_PERCENT ".uno:NumberFormatPercent"
+#define CMD_SID_NUMBER_SCIENTIFIC ".uno:NumberFormatScientific"
+#define CMD_SID_NUMBER_STANDARD ".uno:NumberFormatStandard"
+#define CMD_SID_NUMBER_TIME ".uno:NumberFormatTime"
+#define CMD_SID_OBJECT_HEIGHT ".uno:ObjectHeight"
+#define CMD_SID_OBJECT_LEFT ".uno:ObjectLeft"
+#define CMD_SID_MIRROR_HORIZONTAL ".uno:ObjectMirrorHorizontal"
+#define CMD_SID_MIRROR_VERTICAL ".uno:ObjectMirrorVertical"
+#define CMD_SID_OBJECT_TOP ".uno:ObjectTop"
+#define CMD_SID_OBJECT_WIDTH ".uno:ObjectWidth"
+#define CMD_SID_RANGE_OFFSET ".uno:Offset"
+#define CMD_SID_OLE_OBJECT ".uno:OleObject"
+#define CMD_SID_ORIGINALSIZE ".uno:OriginalSize"
+#define CMD_FID_NORMALVIEWMODE ".uno:NormalViewMode"
+#define CMD_FID_PAGEBREAKMODE ".uno:PagebreakMode"
+#define CMD_SID_FORMATPAGE ".uno:PageFormatDialog"
+#define CMD_SID_PREVIEW_PREVIOUS ".uno:PreviousPage"
+#define CMD_FID_PROTECT_TABLE ".uno:Protect"
+#define CMD_SID_CHG_PROTECT ".uno:ProtectTraceChangeMode"
+#define CMD_SID_SC_SETTEXT ".uno:PutCell"
+#define CMD_SID_SC_RANGE ".uno:Range"
+#define CMD_SID_PIVOT_RECALC ".uno:RecalcPivotTable"
+#define CMD_SID_DETECTIVE_REFRESH ".uno:RefreshArrows"
+#define CMD_SID_REIMPORT_AFTER_LOAD ".uno:ReImportAfterLoad"
+#define CMD_FID_DELETE_TABLE ".uno:Remove"
+#define CMD_SID_TITLE_DESCRIPTION_OBJECT ".uno:ObjectTitleDescription"
+#define CMD_SID_RENAME_OBJECT ".uno:RenameObject"
+#define CMD_FID_REPEAT_SEARCH ".uno:RepeatSearch"
+#define CMD_FID_REPLACE ".uno:Replace"
+#define CMD_FID_REPLACE_ALL ".uno:ReplaceAll"
+#define CMD_SID_CELL_FORMAT_RESET ".uno:ResetAttributes"
+#define CMD_FID_RESET_PRINTZOOM ".uno:ResetPrintZoom"
+#define CMD_SID_RANGE_ROW ".uno:Row"
+#define CMD_FID_ROW_HEIGHT ".uno:RowHeight"
+#define CMD_SID_SBA_IMPORT ".uno:SbaImport"
+#define CMD_FID_SCALE ".uno:Scale"
+#define CMD_SID_SCENARIOS ".uno:ScenarioManager"
+#define CMD_FID_SEARCH ".uno:Search"
+#define CMD_FID_SEARCH_ALL ".uno:SearchAll"
+#define CMD_SID_MARKAREA ".uno:SelectArea"
+#define CMD_SID_OLE_SELECT ".uno:SelectOLE"
+#define CMD_SID_SELECT_COL ".uno:SelectColumn"
+#define CMD_SID_MARKDATAAREA ".uno:SelectData"
+#define CMD_SID_SELECT_DB ".uno:SelectDB"
+#define CMD_SID_SC_ACTIVEOBJECT ".uno:SelectedObject"
+#define CMD_SID_ACTIVE_OBJ_NAME ".uno:SelectedObjectName"
+#define CMD_SID_SC_SELECTION ".uno:Selection"
+#define CMD_SID_SELECT_ROW ".uno:SelectRow"
+#define CMD_SID_SELECT_SCENARIO ".uno:SelectScenario"
+#define CMD_SID_ANCHOR_CELL ".uno:SetAnchorToCell"
+#define CMD_SID_ANCHOR_PAGE ".uno:SetAnchorToPage"
+#define CMD_SID_SETINPUTMODE ".uno:SetInputMode"
+#define CMD_FID_COL_OPT_WIDTH ".uno:SetOptimalColumnWidth"
+#define CMD_FID_COL_OPT_DIRECT ".uno:SetOptimalColumnWidthDirect"
+#define CMD_FID_ROW_OPT_HEIGHT ".uno:SetOptimalRowHeight"
+#define CMD_FID_TABLE_SHOW ".uno:Show"
+#define CMD_FID_CHG_SHOW ".uno:ShowChanges"
+#define CMD_FID_COL_SHOW ".uno:ShowColumn"
+#define CMD_SID_DETECTIVE_ADD_SUCC ".uno:ShowDependents"
+#define CMD_SID_DETECTIVE_ADD_ERR ".uno:ShowErrors"
+#define CMD_SID_DETECTIVE_INVALID ".uno:ShowInvalid"
+#define CMD_SID_DETECTIVE_ADD_PRED ".uno:ShowPrecedents"
+#define CMD_FID_ROW_SHOW ".uno:ShowRow"
+#define CMD_WID_SIMPLE_REF ".uno:SimpleReferenz"
+#define CMD_SID_SORT_ASCENDING ".uno:SortAscending"
+#define CMD_SID_SORT_DESCENDING ".uno:SortDescending"
+#define CMD_FID_MERGE_OFF ".uno:SplitCell"
+#define CMD_SID_WINDOW_SPLIT ".uno:SplitWindow"
+#define CMD_SID_STANDARD_FONTS ".uno:StandardFonts"
+#define CMD_SID_TEXT_STANDARD ".uno:StandardTextAttributes"
+#define CMD_SID_PSZ_FUNCTION ".uno:StatusBarFunc"
+#define CMD_SID_STATUS_DOCPOS ".uno:StatusDocPos"
+#define CMD_SID_STATUS_SUM ".uno:StatusFunction"
+#define CMD_FID_INPUTLINE_STATUS ".uno:StatusInputLine"
+#define CMD_SID_STATUS_PAGESTYLE ".uno:StatusPageStyle"
+#define CMD_FID_SCALESTATUS ".uno:StatusScale"
+#define CMD_SID_STATUS_SELMODE ".uno:StatusSelectionMode"
+#define CMD_SID_STATUS_SELMODE_ERG ".uno:StatusSelectionModeExp"
+#define CMD_SID_STATUS_SELMODE_ERW ".uno:StatusSelectionModeExt"
+#define CMD_SID_STATUS_SELMODE_NORM ".uno:StatusSelectionModeNorm"
+#define CMD_SID_RANGE_TABLE ".uno:Table"
+#define CMD_SID_TABLES_COUNT ".uno:TableCount"
+#define CMD_SID_TABOP ".uno:TableOperation"
+#define CMD_SID_OPENDLG_TABOP ".uno:TableOperationDialog"
+#define CMD_FID_TAB_MENU_RENAME ".uno:RenameTable"
+#define CMD_SID_TABLES_GET ".uno:Tables"
+#define CMD_FID_TAB_SELECTALL ".uno:TableSelectAll"
+#define CMD_FID_TAB_DESELECTALL ".uno:TableDeselectAll"
+#define CMD_SID_DRAWTEXT_ATTR_DLG ".uno:TextAttributes"
+#define CMD_SID_ASSIGNMACRO ".uno:AssignMacro"
+#define CMD_SID_TEXT_TO_COLUMNS ".uno:TextToColumns"
+#define CMD_SID_RANGE_TEXTVALUE ".uno:TextValue"
+#define CMD_SID_ANCHOR_TOGGLE ".uno:ToggleAnchorType"
+#define CMD_SID_TOGGLE_REL ".uno:ToggleRelative"
+#define CMD_FID_PROTECT_DOC ".uno:ToolProtectionDocument"
+#define CMD_SID_SCOPTIONS ".uno:ToolsOptions"
+#define CMD_FID_CHG_RECORD ".uno:TraceChangeMode"
+#define CMD_SID_ULINE_VAL_DOTTED ".uno:UnderlineDotted"
+#define CMD_SID_ULINE_VAL_DOUBLE ".uno:UnderlineDouble"
+#define CMD_SID_ULINE_VAL_NONE ".uno:UnderlineNone"
+#define CMD_SID_ULINE_VAL_SINGLE ".uno:UnderlineSingle"
+#define CMD_SID_UPDATECHART ".uno:UpdateChart"
+#define CMD_SID_UPDATETABLINKS ".uno:UpdateTableLinks"
+#define CMD_FID_VALIDATION ".uno:Validation"
+#define CMD_SID_RANGE_VALUE ".uno:Value"
+#define CMD_SID_V_ALIGNCELL ".uno:VerticalAlignment"
+#define CMD_FID_TOGGLEINPUTLINE ".uno:InputLineVisible"
+#define CMD_FID_TOGGLEHEADERS ".uno:ViewRowColumnHeaders"
+#define CMD_FID_TOGGLEFORMULA ".uno:ToggleFormula"
+#define CMD_FID_TOGGLESYNTAX ".uno:ViewValueHighlighting"
+#define CMD_FID_TABLE_VISIBLE ".uno:Visible"
+#define CMD_SID_ATTR_ALIGN_LINEBREAK ".uno:WrapText"
+#define CMD_SID_PREVIEW_ZOOMIN ".uno:ZoomIn"
+#define CMD_SID_PREVIEW_ZOOMOUT ".uno:ZoomOut"
+#define CMD_SID_FOCUS_INPUTLINE ".uno:FocusInputLine"
+#define CMD_SID_PREVIEW_CLOSE ".uno:ClosePreview"
+#define CMD_SID_PREVIEW_MARGIN ".uno:Margins"
+#define CMD_SID_PREVIEW_SCALINGFACTOR ".uno:ScalingFactor"
+#define CMD_SID_SELECT_TABLES ".uno:SelectTables"
+#define CMD_SID_DP_FILTER ".uno:DataPilotFilter"
+#define CMD_SID_SCATTR_PROTECTION ".uno:Protection"
+#define CMD_SID_MARKARRAYFORMULA ".uno:SelectArrayFormula"
+#define CMD_FID_TAB_RTL ".uno:SheetRightToLeft"
+#define CMD_SID_SHARE_DOC ".uno:ShareDocument"
+
+#endif
diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 1d2304c2a0f2..a10c794b9c43 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -67,7 +67,6 @@ public: static void Init(); // called directly after loading the DLL static void Exit(); // called directly befor unloading the DLL -//UNUSED2008-05 static void FillStatusBar(StatusBar &rBar); static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); }; diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index 8188deca5f40..6a31f883678f 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.hrc @@ -40,293 +40,292 @@ #define ID_FUNCTION_OFFSET 90 -// ID zaehlt ab 1, Hilfe-IDs muessen aber bei HID_SC_FUNC_START anfangen -#define HID_SC_FUNC_DUMMY (HID_SC_FUNC_START-ID_FUNCTION_OFFSET) +#define HID_SC_FUNC_DUMMY "SC_HID_SC_FUNC_DUMMY" -#define HID_FUNC_DBANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DBANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_DBMITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_DBAUSZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_DBMAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_DBMIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_DBPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_DBSTDABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_DBSTDABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DBSUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_DBVARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_DBVARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" +#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2" +#define HID_FUNC_DBMITTELWERT "SC_HID_FUNC_DBMITTELWERT" +#define HID_FUNC_DBAUSZUG "SC_HID_FUNC_DBAUSZUG" +#define HID_FUNC_DBMAX "SC_HID_FUNC_DBMAX" +#define HID_FUNC_DBMIN "SC_HID_FUNC_DBMIN" +#define HID_FUNC_DBPRODUKT "SC_HID_FUNC_DBPRODUKT" +#define HID_FUNC_DBSTDABW "SC_HID_FUNC_DBSTDABW" +#define HID_FUNC_DBSTDABWN "SC_HID_FUNC_DBSTDABWN" +#define HID_FUNC_DBSUMME "SC_HID_FUNC_DBSUMME" +#define HID_FUNC_DBVARIANZ "SC_HID_FUNC_DBVARIANZ" +#define HID_FUNC_DBVARIANZEN "SC_HID_FUNC_DBVARIANZEN" -#define HID_FUNC_DATUM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DATWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_TAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_TAGE360 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_STUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_MINUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_MONAT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_JETZT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SEKUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZEITWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_HEUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WOCHENTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_JAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_TAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_KALENDERWOCHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_OSTERSONNTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_DATUM "SC_HID_FUNC_DATUM" +#define HID_FUNC_DATWERT "SC_HID_FUNC_DATWERT" +#define HID_FUNC_TAG "SC_HID_FUNC_TAG" +#define HID_FUNC_TAGE360 "SC_HID_FUNC_TAGE360" +#define HID_FUNC_STUNDE "SC_HID_FUNC_STUNDE" +#define HID_FUNC_MINUTE "SC_HID_FUNC_MINUTE" +#define HID_FUNC_MONAT "SC_HID_FUNC_MONAT" +#define HID_FUNC_JETZT "SC_HID_FUNC_JETZT" +#define HID_FUNC_SEKUNDE "SC_HID_FUNC_SEKUNDE" +#define HID_FUNC_ZEIT "SC_HID_FUNC_ZEIT" +#define HID_FUNC_ZEITWERT "SC_HID_FUNC_ZEITWERT" +#define HID_FUNC_HEUTE "SC_HID_FUNC_HEUTE" +#define HID_FUNC_WOCHENTAG "SC_HID_FUNC_WOCHENTAG" +#define HID_FUNC_JAHR "SC_HID_FUNC_JAHR" +#define HID_FUNC_TAGE "SC_HID_FUNC_TAGE" +#define HID_FUNC_KALENDERWOCHE "SC_HID_FUNC_KALENDERWOCHE" +#define HID_FUNC_OSTERSONNTAG "SC_HID_FUNC_OSTERSONNTAG" -#define HID_FUNC_BW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ZW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZZR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_RMZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZINS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_KAPZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_KUMKAPITAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_KUMZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_LIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_GDA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_GDA2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VDB (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_EFFEKTIV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_NOMINAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_NBW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_IKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LAUFZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ZGZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_QIKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ISPMT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_BW "SC_HID_FUNC_BW" +#define HID_FUNC_ZW "SC_HID_FUNC_ZW" +#define HID_FUNC_ZZR "SC_HID_FUNC_ZZR" +#define HID_FUNC_RMZ "SC_HID_FUNC_RMZ" +#define HID_FUNC_ZINS "SC_HID_FUNC_ZINS" +#define HID_FUNC_ZINSZ "SC_HID_FUNC_ZINSZ" +#define HID_FUNC_KAPZ "SC_HID_FUNC_KAPZ" +#define HID_FUNC_KUMKAPITAL "SC_HID_FUNC_KUMKAPITAL" +#define HID_FUNC_KUMZINSZ "SC_HID_FUNC_KUMZINSZ" +#define HID_FUNC_DIA "SC_HID_FUNC_DIA" +#define HID_FUNC_LIA "SC_HID_FUNC_LIA" +#define HID_FUNC_GDA "SC_HID_FUNC_GDA" +#define HID_FUNC_GDA2 "SC_HID_FUNC_GDA2" +#define HID_FUNC_VDB "SC_HID_FUNC_VDB" +#define HID_FUNC_EFFEKTIV "SC_HID_FUNC_EFFEKTIV" +#define HID_FUNC_NOMINAL "SC_HID_FUNC_NOMINAL" +#define HID_FUNC_NBW "SC_HID_FUNC_NBW" +#define HID_FUNC_IKV "SC_HID_FUNC_IKV" +#define HID_FUNC_LAUFZEIT "SC_HID_FUNC_LAUFZEIT" +#define HID_FUNC_ZGZ "SC_HID_FUNC_ZGZ" +#define HID_FUNC_QIKV "SC_HID_FUNC_QIKV" +#define HID_FUNC_ISPMT "SC_HID_FUNC_ISPMT" -#define HID_FUNC_ISTBEZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ISTFEHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ISTFEHLER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_ISTLEER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ISTLOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ISTNV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ISTKTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_ISTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ISTZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ISTFORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_N (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_NV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_AKTUELL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ZELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_INFO (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_ISTBEZUG "SC_HID_FUNC_ISTBEZUG" +#define HID_FUNC_ISTFEHL "SC_HID_FUNC_ISTFEHL" +#define HID_FUNC_ISTFEHLER "SC_HID_FUNC_ISTFEHLER" +#define HID_FUNC_ISTLEER "SC_HID_FUNC_ISTLEER" +#define HID_FUNC_ISTLOG "SC_HID_FUNC_ISTLOG" +#define HID_FUNC_ISTNV "SC_HID_FUNC_ISTNV" +#define HID_FUNC_ISTKTEXT "SC_HID_FUNC_ISTKTEXT" +#define HID_FUNC_ISTTEXT "SC_HID_FUNC_ISTTEXT" +#define HID_FUNC_ISTZAHL "SC_HID_FUNC_ISTZAHL" +#define HID_FUNC_ISTFORMEL "SC_HID_FUNC_ISTFORMEL" +#define HID_FUNC_N "SC_HID_FUNC_N" +#define HID_FUNC_NV "SC_HID_FUNC_NV" +#define HID_FUNC_TYP "SC_HID_FUNC_TYP" +#define HID_FUNC_AKTUELL "SC_HID_FUNC_AKTUELL" +#define HID_FUNC_FORMEL "SC_HID_FUNC_FORMEL" +#define HID_FUNC_ZELLE "SC_HID_FUNC_ZELLE" +#define HID_FUNC_INFO "SC_HID_FUNC_INFO" -#define HID_FUNC_FALSCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_NICHT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_WENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ODER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_UND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_FALSCH "SC_HID_FUNC_FALSCH" +#define HID_FUNC_NICHT "SC_HID_FUNC_NICHT" +#define HID_FUNC_WAHR "SC_HID_FUNC_WAHR" +#define HID_FUNC_WENN "SC_HID_FUNC_WENN" +#define HID_FUNC_ODER "SC_HID_FUNC_ODER" +#define HID_FUNC_UND "SC_HID_FUNC_UND" -#define HID_FUNC_ABS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_POTENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ANZAHLLEEREZELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_PI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_SUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_QUADRATESUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_PRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ZAEHLENWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_WURZEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZUFALLSZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_ISTGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_ISTUNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_KOMBINATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_KOMBINATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ARCCOS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_ARCSIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_ARCOSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_ARSINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ARCCOT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_ARCTAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ARCOTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_ARTANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_COS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_SIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_COT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_TAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_COSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_SINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_COTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_TANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_ARCTAN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_DEG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_RAD (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_EXP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_LOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_LN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_LOG10 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_FAKULTAET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_REST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_VORZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_TEILERGEBNIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GANZZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_KUERZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_RUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_AUFRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_ABRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_GERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_UNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_OBERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_UNTERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_GGT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_KGV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_UMRECHNEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+54) -#define HID_FUNC_EUROCONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+55) +#define HID_FUNC_ABS "SC_HID_FUNC_ABS" +#define HID_FUNC_POTENZ "SC_HID_FUNC_POTENZ" +#define HID_FUNC_ANZAHLLEEREZELLEN "SC_HID_FUNC_ANZAHLLEEREZELLEN" +#define HID_FUNC_PI "SC_HID_FUNC_PI" +#define HID_FUNC_SUMME "SC_HID_FUNC_SUMME" +#define HID_FUNC_QUADRATESUMME "SC_HID_FUNC_QUADRATESUMME" +#define HID_FUNC_PRODUKT "SC_HID_FUNC_PRODUKT" +#define HID_FUNC_SUMMEWENN "SC_HID_FUNC_SUMMEWENN" +#define HID_FUNC_ZAEHLENWENN "SC_HID_FUNC_ZAEHLENWENN" +#define HID_FUNC_WURZEL "SC_HID_FUNC_WURZEL" +#define HID_FUNC_ZUFALLSZAHL "SC_HID_FUNC_ZUFALLSZAHL" +#define HID_FUNC_ISTGERADE "SC_HID_FUNC_ISTGERADE" +#define HID_FUNC_ISTUNGERADE "SC_HID_FUNC_ISTUNGERADE" +#define HID_FUNC_KOMBINATIONEN "SC_HID_FUNC_KOMBINATIONEN" +#define HID_FUNC_KOMBINATIONEN2 "SC_HID_FUNC_KOMBINATIONEN2" +#define HID_FUNC_ARCCOS "SC_HID_FUNC_ARCCOS" +#define HID_FUNC_ARCSIN "SC_HID_FUNC_ARCSIN" +#define HID_FUNC_ARCOSHYP "SC_HID_FUNC_ARCOSHYP" +#define HID_FUNC_ARSINHYP "SC_HID_FUNC_ARSINHYP" +#define HID_FUNC_ARCCOT "SC_HID_FUNC_ARCCOT" +#define HID_FUNC_ARCTAN "SC_HID_FUNC_ARCTAN" +#define HID_FUNC_ARCOTHYP "SC_HID_FUNC_ARCOTHYP" +#define HID_FUNC_ARTANHYP "SC_HID_FUNC_ARTANHYP" +#define HID_FUNC_COS "SC_HID_FUNC_COS" +#define HID_FUNC_SIN "SC_HID_FUNC_SIN" +#define HID_FUNC_COT "SC_HID_FUNC_COT" +#define HID_FUNC_TAN "SC_HID_FUNC_TAN" +#define HID_FUNC_COSHYP "SC_HID_FUNC_COSHYP" +#define HID_FUNC_SINHYP "SC_HID_FUNC_SINHYP" +#define HID_FUNC_COTHYP "SC_HID_FUNC_COTHYP" +#define HID_FUNC_TANHYP "SC_HID_FUNC_TANHYP" +#define HID_FUNC_ARCTAN2 "SC_HID_FUNC_ARCTAN2" +#define HID_FUNC_DEG "SC_HID_FUNC_DEG" +#define HID_FUNC_RAD "SC_HID_FUNC_RAD" +#define HID_FUNC_EXP "SC_HID_FUNC_EXP" +#define HID_FUNC_LOG "SC_HID_FUNC_LOG" +#define HID_FUNC_LN "SC_HID_FUNC_LN" +#define HID_FUNC_LOG10 "SC_HID_FUNC_LOG10" +#define HID_FUNC_FAKULTAET "SC_HID_FUNC_FAKULTAET" +#define HID_FUNC_REST "SC_HID_FUNC_REST" +#define HID_FUNC_VORZEICHEN "SC_HID_FUNC_VORZEICHEN" +#define HID_FUNC_TEILERGEBNIS "SC_HID_FUNC_TEILERGEBNIS" +#define HID_FUNC_GANZZAHL "SC_HID_FUNC_GANZZAHL" +#define HID_FUNC_KUERZEN "SC_HID_FUNC_KUERZEN" +#define HID_FUNC_RUNDEN "SC_HID_FUNC_RUNDEN" +#define HID_FUNC_AUFRUNDEN "SC_HID_FUNC_AUFRUNDEN" +#define HID_FUNC_ABRUNDEN "SC_HID_FUNC_ABRUNDEN" +#define HID_FUNC_GERADE "SC_HID_FUNC_GERADE" +#define HID_FUNC_UNGERADE "SC_HID_FUNC_UNGERADE" +#define HID_FUNC_OBERGRENZE "SC_HID_FUNC_OBERGRENZE" +#define HID_FUNC_UNTERGRENZE "SC_HID_FUNC_UNTERGRENZE" +#define HID_FUNC_GGT "SC_HID_FUNC_GGT" +#define HID_FUNC_KGV "SC_HID_FUNC_KGV" +#define HID_FUNC_UMRECHNEN "SC_HID_FUNC_UMRECHNEN" +#define HID_FUNC_EUROCONVERT "SC_HID_FUNC_EUROCONVERT" -#define HID_FUNC_MTRANS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_MMULT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MDET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_EINHEITSMATRIX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SUMMENPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_SUMMEX2MY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEX2PY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SUMMEXMY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_HAEUFIGKEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_RGP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_RKP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TREND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VARIATION (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_MTRANS "SC_HID_FUNC_MTRANS" +#define HID_FUNC_MMULT "SC_HID_FUNC_MMULT" +#define HID_FUNC_MDET "SC_HID_FUNC_MDET" +#define HID_FUNC_MINV "SC_HID_FUNC_MINV" +#define HID_FUNC_EINHEITSMATRIX "SC_HID_FUNC_EINHEITSMATRIX" +#define HID_FUNC_SUMMENPRODUKT "SC_HID_FUNC_SUMMENPRODUKT" +#define HID_FUNC_SUMMEX2MY2 "SC_HID_FUNC_SUMMEX2MY2" +#define HID_FUNC_SUMMEX2PY2 "SC_HID_FUNC_SUMMEX2PY2" +#define HID_FUNC_SUMMEXMY2 "SC_HID_FUNC_SUMMEXMY2" +#define HID_FUNC_HAEUFIGKEIT "SC_HID_FUNC_HAEUFIGKEIT" +#define HID_FUNC_RGP "SC_HID_FUNC_RGP" +#define HID_FUNC_RKP "SC_HID_FUNC_RKP" +#define HID_FUNC_TREND "SC_HID_FUNC_TREND" +#define HID_FUNC_VARIATION "SC_HID_FUNC_VARIATION" -#define HID_FUNC_ANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_VARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_STABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_STABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_MITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_SUMQUADABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_MITTELABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_SCHIEFE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_KURT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_GEOMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_HARMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_MODALWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_MEDIAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_QUANTIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_QUARTILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_KGROESSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_KKLEINSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_QUANTILSRANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_RANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_GESTUTZTMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_WAHRSCHBEREICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_B (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_PHI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_GAUSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_FISHER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_FISHERINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_BINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_NEGBINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_KRITBINOM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_POISSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_NORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_NORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_STANDNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_STANDNORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_LOGNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_LOGINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_EXPONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_GAMMAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GAMMAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_GAMMALN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_BETAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_BETAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_WEIBULL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_HYPGEOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_TVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_TINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_FVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_FINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_CHIVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_CHIINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+54) -#define HID_FUNC_STANDARDISIERUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+55) -#define HID_FUNC_VARIATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+56) -#define HID_FUNC_VARIATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+57) -#define HID_FUNC_KONFIDENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+58) -#define HID_FUNC_GTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+59) -#define HID_FUNC_CHITEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+60) -#define HID_FUNC_FTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+61) -#define HID_FUNC_TTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+62) -#define HID_FUNC_BESTIMMTHEITSMASS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+63) -#define HID_FUNC_ACHSENABSCHNITT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+64) -#define HID_FUNC_STEIGUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+65) -#define HID_FUNC_STFEHLERYX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+66) -#define HID_FUNC_PEARSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+67) -#define HID_FUNC_KORREL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+68) -#define HID_FUNC_KOVAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+69) -#define HID_FUNC_SCHAETZER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+70) -#define HID_FUNC_MINA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+71) -#define HID_FUNC_MAXA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+72) -#define HID_FUNC_MITTELWERTA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+73) -#define HID_FUNC_STABWA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+74) -#define HID_FUNC_STABWNA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+75) -#define HID_FUNC_VARIANZA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+76) -#define HID_FUNC_VARIANZENA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+77) -#define HID_FUNC_CHISQDIST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+78) -#define HID_FUNC_CHISQINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+79) -#define HID_FUNC_GAMMA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+80) +#define HID_FUNC_ANZAHL "SC_HID_FUNC_ANZAHL" +#define HID_FUNC_ANZAHL2 "SC_HID_FUNC_ANZAHL2" +#define HID_FUNC_MAX "SC_HID_FUNC_MAX" +#define HID_FUNC_MIN "SC_HID_FUNC_MIN" +#define HID_FUNC_VARIANZ "SC_HID_FUNC_VARIANZ" +#define HID_FUNC_VARIANZEN "SC_HID_FUNC_VARIANZEN" +#define HID_FUNC_STABW "SC_HID_FUNC_STABW" +#define HID_FUNC_STABWN "SC_HID_FUNC_STABWN" +#define HID_FUNC_MITTELWERT "SC_HID_FUNC_MITTELWERT" +#define HID_FUNC_SUMQUADABW "SC_HID_FUNC_SUMQUADABW" +#define HID_FUNC_MITTELABW "SC_HID_FUNC_MITTELABW" +#define HID_FUNC_SCHIEFE "SC_HID_FUNC_SCHIEFE" +#define HID_FUNC_KURT "SC_HID_FUNC_KURT" +#define HID_FUNC_GEOMITTEL "SC_HID_FUNC_GEOMITTEL" +#define HID_FUNC_HARMITTEL "SC_HID_FUNC_HARMITTEL" +#define HID_FUNC_MODALWERT "SC_HID_FUNC_MODALWERT" +#define HID_FUNC_MEDIAN "SC_HID_FUNC_MEDIAN" +#define HID_FUNC_QUANTIL "SC_HID_FUNC_QUANTIL" +#define HID_FUNC_QUARTILE "SC_HID_FUNC_QUARTILE" +#define HID_FUNC_KGROESSTE "SC_HID_FUNC_KGROESSTE" +#define HID_FUNC_KKLEINSTE "SC_HID_FUNC_KKLEINSTE" +#define HID_FUNC_QUANTILSRANG "SC_HID_FUNC_QUANTILSRANG" +#define HID_FUNC_RANG "SC_HID_FUNC_RANG" +#define HID_FUNC_GESTUTZTMITTEL "SC_HID_FUNC_GESTUTZTMITTEL" +#define HID_FUNC_WAHRSCHBEREICH "SC_HID_FUNC_WAHRSCHBEREICH" +#define HID_FUNC_B "SC_HID_FUNC_B" +#define HID_FUNC_PHI "SC_HID_FUNC_PHI" +#define HID_FUNC_GAUSS "SC_HID_FUNC_GAUSS" +#define HID_FUNC_FISHER "SC_HID_FUNC_FISHER" +#define HID_FUNC_FISHERINV "SC_HID_FUNC_FISHERINV" +#define HID_FUNC_BINOMVERT "SC_HID_FUNC_BINOMVERT" +#define HID_FUNC_NEGBINOMVERT "SC_HID_FUNC_NEGBINOMVERT" +#define HID_FUNC_KRITBINOM "SC_HID_FUNC_KRITBINOM" +#define HID_FUNC_POISSON "SC_HID_FUNC_POISSON" +#define HID_FUNC_NORMVERT "SC_HID_FUNC_NORMVERT" +#define HID_FUNC_NORMINV "SC_HID_FUNC_NORMINV" +#define HID_FUNC_STANDNORMVERT "SC_HID_FUNC_STANDNORMVERT" +#define HID_FUNC_STANDNORMINV "SC_HID_FUNC_STANDNORMINV" +#define HID_FUNC_LOGNORMVERT "SC_HID_FUNC_LOGNORMVERT" +#define HID_FUNC_LOGINV "SC_HID_FUNC_LOGINV" +#define HID_FUNC_EXPONVERT "SC_HID_FUNC_EXPONVERT" +#define HID_FUNC_GAMMAVERT "SC_HID_FUNC_GAMMAVERT" +#define HID_FUNC_GAMMAINV "SC_HID_FUNC_GAMMAINV" +#define HID_FUNC_GAMMALN "SC_HID_FUNC_GAMMALN" +#define HID_FUNC_BETAVERT "SC_HID_FUNC_BETAVERT" +#define HID_FUNC_BETAINV "SC_HID_FUNC_BETAINV" +#define HID_FUNC_WEIBULL "SC_HID_FUNC_WEIBULL" +#define HID_FUNC_HYPGEOMVERT "SC_HID_FUNC_HYPGEOMVERT" +#define HID_FUNC_TVERT "SC_HID_FUNC_TVERT" +#define HID_FUNC_TINV "SC_HID_FUNC_TINV" +#define HID_FUNC_FVERT "SC_HID_FUNC_FVERT" +#define HID_FUNC_FINV "SC_HID_FUNC_FINV" +#define HID_FUNC_CHIVERT "SC_HID_FUNC_CHIVERT" +#define HID_FUNC_CHIINV "SC_HID_FUNC_CHIINV" +#define HID_FUNC_STANDARDISIERUNG "SC_HID_FUNC_STANDARDISIERUNG" +#define HID_FUNC_VARIATIONEN "SC_HID_FUNC_VARIATIONEN" +#define HID_FUNC_VARIATIONEN2 "SC_HID_FUNC_VARIATIONEN2" +#define HID_FUNC_KONFIDENZ "SC_HID_FUNC_KONFIDENZ" +#define HID_FUNC_GTEST "SC_HID_FUNC_GTEST" +#define HID_FUNC_CHITEST "SC_HID_FUNC_CHITEST" +#define HID_FUNC_FTEST "SC_HID_FUNC_FTEST" +#define HID_FUNC_TTEST "SC_HID_FUNC_TTEST" +#define HID_FUNC_BESTIMMTHEITSMASS "SC_HID_FUNC_BESTIMMTHEITSMASS" +#define HID_FUNC_ACHSENABSCHNITT "SC_HID_FUNC_ACHSENABSCHNITT" +#define HID_FUNC_STEIGUNG "SC_HID_FUNC_STEIGUNG" +#define HID_FUNC_STFEHLERYX "SC_HID_FUNC_STFEHLERYX" +#define HID_FUNC_PEARSON "SC_HID_FUNC_PEARSON" +#define HID_FUNC_KORREL "SC_HID_FUNC_KORREL" +#define HID_FUNC_KOVAR "SC_HID_FUNC_KOVAR" +#define HID_FUNC_SCHAETZER "SC_HID_FUNC_SCHAETZER" +#define HID_FUNC_MINA "SC_HID_FUNC_MINA" +#define HID_FUNC_MAXA "SC_HID_FUNC_MAXA" +#define HID_FUNC_MITTELWERTA "SC_HID_FUNC_MITTELWERTA" +#define HID_FUNC_STABWA "SC_HID_FUNC_STABWA" +#define HID_FUNC_STABWNA "SC_HID_FUNC_STABWNA" +#define HID_FUNC_VARIANZA "SC_HID_FUNC_VARIANZA" +#define HID_FUNC_VARIANZENA "SC_HID_FUNC_VARIANZENA" +#define HID_FUNC_CHISQDIST "SC_HID_FUNC_CHISQDIST" +#define HID_FUNC_CHISQINV "SC_HID_FUNC_CHISQINV" +#define HID_FUNC_GAMMA "SC_HID_FUNC_GAMMA" -#define HID_FUNC_ADRESSE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_BEREICHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SPALTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZEILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SPALTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ZEILEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_WVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_INDEX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_INDIREKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_VERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_VERGLEICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VERSCHIEBUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FEHLERTYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_VORLAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_DDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_TABELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_GETPIVOTDATA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_ADRESSE "SC_HID_FUNC_ADRESSE" +#define HID_FUNC_BEREICHE "SC_HID_FUNC_BEREICHE" +#define HID_FUNC_WAHL "SC_HID_FUNC_WAHL" +#define HID_FUNC_SPALTE "SC_HID_FUNC_SPALTE" +#define HID_FUNC_ZEILE "SC_HID_FUNC_ZEILE" +#define HID_FUNC_SPALTEN "SC_HID_FUNC_SPALTEN" +#define HID_FUNC_ZEILEN "SC_HID_FUNC_ZEILEN" +#define HID_FUNC_WVERWEIS "SC_HID_FUNC_WVERWEIS" +#define HID_FUNC_SVERWEIS "SC_HID_FUNC_SVERWEIS" +#define HID_FUNC_INDEX "SC_HID_FUNC_INDEX" +#define HID_FUNC_INDIREKT "SC_HID_FUNC_INDIREKT" +#define HID_FUNC_VERWEIS "SC_HID_FUNC_VERWEIS" +#define HID_FUNC_VERGLEICH "SC_HID_FUNC_VERGLEICH" +#define HID_FUNC_VERSCHIEBUNG "SC_HID_FUNC_VERSCHIEBUNG" +#define HID_FUNC_FEHLERTYP "SC_HID_FUNC_FEHLERTYP" +#define HID_FUNC_VORLAGE "SC_HID_FUNC_VORLAGE" +#define HID_FUNC_DDE "SC_HID_FUNC_DDE" +#define HID_FUNC_TABELLE "SC_HID_FUNC_TABELLE" +#define HID_FUNC_TABELLEN "SC_HID_FUNC_TABELLEN" +#define HID_FUNC_HYPERLINK "SC_HID_FUNC_HYPERLINK" +#define HID_FUNC_GETPIVOTDATA "SC_HID_FUNC_GETPIVOTDATA" -#define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SAEUBERN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VERKETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_IDENTISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_FINDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUCHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_GLAETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_GROSS2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_GROSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_KLEIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_TEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_T (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ERSETZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_FEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_LAENGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LINKS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_RECHTS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_TEIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_WIEDERHOLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_WECHSELN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_BASIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_DEZIMAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_ROEMISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_ARABISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_BAHTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_JIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_ASC (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_UNICODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_UNICHAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_NUMBERVALUE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+33) +#define HID_FUNC_CODE "SC_HID_FUNC_CODE" +#define HID_FUNC_DM "SC_HID_FUNC_DM" +#define HID_FUNC_ZEICHEN "SC_HID_FUNC_ZEICHEN" +#define HID_FUNC_SAEUBERN "SC_HID_FUNC_SAEUBERN" +#define HID_FUNC_VERKETTEN "SC_HID_FUNC_VERKETTEN" +#define HID_FUNC_IDENTISCH "SC_HID_FUNC_IDENTISCH" +#define HID_FUNC_FINDEN "SC_HID_FUNC_FINDEN" +#define HID_FUNC_SUCHEN "SC_HID_FUNC_SUCHEN" +#define HID_FUNC_GLAETTEN "SC_HID_FUNC_GLAETTEN" +#define HID_FUNC_GROSS2 "SC_HID_FUNC_GROSS2" +#define HID_FUNC_GROSS "SC_HID_FUNC_GROSS" +#define HID_FUNC_KLEIN "SC_HID_FUNC_KLEIN" +#define HID_FUNC_WERT "SC_HID_FUNC_WERT" +#define HID_FUNC_TEXT "SC_HID_FUNC_TEXT" +#define HID_FUNC_T "SC_HID_FUNC_T" +#define HID_FUNC_ERSETZEN "SC_HID_FUNC_ERSETZEN" +#define HID_FUNC_FEST "SC_HID_FUNC_FEST" +#define HID_FUNC_LAENGE "SC_HID_FUNC_LAENGE" +#define HID_FUNC_LINKS "SC_HID_FUNC_LINKS" +#define HID_FUNC_RECHTS "SC_HID_FUNC_RECHTS" +#define HID_FUNC_TEIL "SC_HID_FUNC_TEIL" +#define HID_FUNC_WIEDERHOLEN "SC_HID_FUNC_WIEDERHOLEN" +#define HID_FUNC_WECHSELN "SC_HID_FUNC_WECHSELN" +#define HID_FUNC_BASIS "SC_HID_FUNC_BASIS" +#define HID_FUNC_DEZIMAL "SC_HID_FUNC_DEZIMAL" +#define HID_FUNC_ROEMISCH "SC_HID_FUNC_ROEMISCH" +#define HID_FUNC_ARABISCH "SC_HID_FUNC_ARABISCH" +#define HID_FUNC_BAHTTEXT "SC_HID_FUNC_BAHTTEXT" +#define HID_FUNC_JIS "SC_HID_FUNC_JIS" +#define HID_FUNC_ASC "SC_HID_FUNC_ASC" +#define HID_FUNC_UNICODE "SC_HID_FUNC_UNICODE" +#define HID_FUNC_UNICHAR "SC_HID_FUNC_UNICHAR" +#define HID_FUNC_NUMBERVALUE "SC_HID_FUNC_NUMBERVALUE" diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index ee2c956e7742..e9fbf493da02 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -157,7 +157,6 @@ public: ScModule( SfxObjectFactory* pFact ); virtual ~ScModule(); - virtual void FillStatusBar(StatusBar &rBar); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); void DeleteCfg(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 2081181b7537..e38dc73eeac5 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1138,7 +1138,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) { rbSuppressed = (bool)GetNum(); pDesc->nCategory = GetNum(); - pDesc->nHelpId = GetNum() + 32768; //! Hack, see scfuncs.src + pDesc->sHelpId = ReadByteStringRes(); //! Hack, see scfuncs.src pDesc->nArgCount = GetNum(); USHORT nArgs = pDesc->nArgCount; if (nArgs >= VAR_ARGS) @@ -1428,7 +1428,6 @@ ScFuncDesc::ScFuncDesc() : nFIndex (0), nCategory (0), nArgCount (0), - nHelpId (0), bIncomplete (false), bHasSuppressedArgs(false) {} @@ -1470,7 +1469,7 @@ void ScFuncDesc::Clear() nFIndex = 0; nCategory = 0; - nHelpId = 0; + sHelpId = ""; bIncomplete = false; bHasSuppressedArgs = false; } @@ -1704,9 +1703,9 @@ void ScFuncDesc::initArgumentInfo() const return GetSignature(); } // ----------------------------------------------------------------------------- -long ScFuncDesc::getHelpId() const +rtl::OString ScFuncDesc::getHelpId() const { - return nHelpId; + return sHelpId; } // ----------------------------------------------------------------------------- diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index b2f085ed64e5..f5186daf0dac 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -29,7 +29,7 @@ #define SC_ADDINHELPID_HXX #include <rtl/ustring.hxx> - +#include <rtl/string.hxx> // ============================================================================ @@ -50,7 +50,7 @@ public: void SetServiceName( const ::rtl::OUString& rServiceName ); /** @return The help ID of the function with given built-in name or 0 if not found. */ - sal_uInt16 GetHelpId( const ::rtl::OUString& rFuncName ) const; + rtl::OString GetHelpId( const ::rtl::OUString& rFuncName ) const; }; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index c0ae60f13841..9fc1a7aa25cc 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -82,7 +82,7 @@ using namespace com::sun::star; ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc, const String& rDesc, - USHORT nCat, USHORT nHelp, + USHORT nCat, const rtl::OString& sHelp, const uno::Reference<reflection::XIdlMethod>& rFunc, const uno::Any& rO, long nAC, const ScAddInArgDesc* pAD, @@ -97,7 +97,7 @@ ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc, nArgCount( nAC ), nCallerPos( nCP ), nCategory( nCat ), - nHelpId( nHelp ), + sHelpId( sHelp ), bCompInitialized( FALSE ) { if ( nArgCount ) @@ -607,7 +607,7 @@ void ScUnoAddInCollection::ReadConfiguration() } } - USHORT nHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); + rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); uno::Reference<reflection::XIdlMethod> xFunc; // remains empty uno::Any aObject; // also empty @@ -616,7 +616,7 @@ void ScUnoAddInCollection::ReadConfiguration() ScUnoAddInFuncData* pData = new ScUnoAddInFuncData( aFuncName, aLocalName, aDescription, - nCategory, nHelpId, + nCategory, sHelpId, xFunc, aObject, nVisibleCount, pVisibleArgs, nCallerPos ); @@ -935,7 +935,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& xAddIn->getProgrammaticCategoryName( aFuncU ) ) ); - USHORT nHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); + rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); rtl::OUString aLocalU; try @@ -1014,7 +1014,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>& ppFuncData[nFuncPos+nOld] = new ScUnoAddInFuncData( aFuncName, aLocalName, aDescription, - nCategory, nHelpId, + nCategory, sHelpId, xFunc, aObject, nVisibleCount, pVisibleArgs, nCallerPos ); @@ -1337,7 +1337,7 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r rDesc.pFuncName = new String( rFuncData.GetUpperLocal() ); //! upper? rDesc.nCategory = rFuncData.GetCategory(); - rDesc.nHelpId = rFuncData.GetHelpId(); + rDesc.sHelpId = rFuncData.GetHelpId(); String aDesc = rFuncData.GetDescription(); if (!aDesc.Len()) diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index a4de52e27b1b..3f261fd3917c 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -37,7 +37,7 @@ struct ScUnoAddInHelpId { const sal_Char* pFuncName; - sal_uInt16 nHelpId; + const sal_Char* sHelpId; }; @@ -189,10 +189,10 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceN nArrayCount = nSize / sizeof( ScUnoAddInHelpId ); } -sal_uInt16 ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncName ) const +rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncName ) const { if( !pCurrHelpIds || !nArrayCount ) - return 0; + return rtl::OString(); const ScUnoAddInHelpId* pFirst = pCurrHelpIds; const ScUnoAddInHelpId* pLast = pCurrHelpIds + nArrayCount - 1; @@ -202,14 +202,14 @@ sal_uInt16 ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncNam const ScUnoAddInHelpId* pMiddle = pFirst + (pLast - pFirst) / 2; sal_Int32 nResult = rFuncName.compareToAscii( pMiddle->pFuncName ); if( !nResult ) - return pMiddle->nHelpId; + return pMiddle->sHelpId; else if( nResult < 0 ) pLast = pMiddle - 1; else pFirst = pMiddle + 1; } - return 0; + return rtl::OString(); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 484734acc888..f6fc2cb27b71 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -177,28 +177,22 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : InsertWindow ( 7, &aTextWindow, 0, 6 ); aWndPos .SetQuickHelpText( ScResId( SCSTR_QHELP_POSWND ) ); - // FIXME: HELPID - aWndPos .SetHelpId ( ""/*HID_INSWIN_POS*/ ); + aWndPos .SetHelpId ( HID_INSWIN_POS ); aTextWindow.SetQuickHelpText( ScResId( SCSTR_QHELP_INPUTWND ) ); - // FIXME: HELPID - aTextWindow.SetHelpId ( ""/*HID_INSWIN_INPUT*/ ); + aTextWindow.SetHelpId ( HID_INSWIN_INPUT ); // kein SetHelpText, die Hilfetexte kommen aus der Hilfe SetItemText ( SID_INPUT_FUNCTION, ScResId( SCSTR_QHELP_BTNCALC ) ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_FUNCTION, ""/*HID_INSWIN_CALC*/ ); + SetHelpId ( SID_INPUT_FUNCTION, HID_INSWIN_CALC ); SetItemText ( SID_INPUT_SUM, aTextSum ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_SUM, ""/*HID_INSWIN_SUMME*/ ); + SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_EQUAL, ""/*HID_INSWIN_FUNC*/ ); + SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); - // FIXME: HELPID - SetHelpId( ""/*HID_SC_INPUTWIN*/ ); // fuer die ganze Eingabezeile + SetHelpId( HID_SC_INPUTWIN ); // fuer die ganze Eingabezeile aWndPos .Show(); aTextWindow .Show(); @@ -566,11 +560,9 @@ void ScInputWindow::SetOkCancelMode() InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), 0, 3 ); InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), 0, 4 ); SetItemText ( SID_INPUT_CANCEL, aTextCancel ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_CANCEL, ""/*HID_INSWIN_CANCEL*/ ); + SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL ); SetItemText ( SID_INPUT_OK, aTextOk ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_OK, ""/*HID_INSWIN_OK*/ ); + SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK ); bIsOkCancelMode = TRUE; } } @@ -593,11 +585,9 @@ void ScInputWindow::SetSumAssignMode() InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 ); InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 ); SetItemText ( SID_INPUT_SUM, aTextSum ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_SUM, ""/*HID_INSWIN_SUMME*/ ); + SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_EQUAL, ""/*HID_INSWIN_FUNC*/ ); + SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); bIsOkCancelMode = FALSE; SetFormulaMode(FALSE); // kein editieren -> keine Formel diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 11e33a8892e8..4a460eb7e4ad 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -364,59 +364,5 @@ void ScDLL::Exit() // ScGlobal::Clear ist schon im Module-dtor } -//------------------------------------------------------------------ -// Statusbar -//------------------------------------------------------------------ - -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) - -//UNUSED2008-05 void ScDLL::FillStatusBar(StatusBar &rStatusBar) -//UNUSED2008-05 { -//UNUSED2008-05 // Dokumentposition (Tabelle x / y) -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_DOCPOS, -//UNUSED2008-05 TEXT_WIDTH( String().Fill( 10, 'X' ) ), -//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); -//UNUSED2008-05 -//UNUSED2008-05 // Seitenvorlage -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, -//UNUSED2008-05 TEXT_WIDTH( String().Fill( 15, 'X' ) ), -//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); -//UNUSED2008-05 -//UNUSED2008-05 // Ma"sstab -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_ZOOM, -//UNUSED2008-05 SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Einfuege-/Ueberschreibmodus -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_INSERT, -//UNUSED2008-05 SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Selektionsmodus -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_SELMODE, -//UNUSED2008-05 SvxSelectionModeControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Dokument geaendert -//UNUSED2008-05 rStatusBar.InsertItem( SID_DOC_MODIFIED, -//UNUSED2008-05 SvxModifyControl::GetDefItemWidth(rStatusBar)); -//UNUSED2008-05 -//UNUSED2008-05 // signatures -//UNUSED2008-05 rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); -//UNUSED2008-05 rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); -//UNUSED2008-05 -//UNUSED2008-05 // Mail -//UNUSED2008-05 rStatusBar.InsertItem( SID_MAIL_NOTIFY, -//UNUSED2008-05 TEXT_WIDTH( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Mail")) ), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_SIZE, -//UNUSED2008-05 SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); -//UNUSED2008-05 } - -#undef TEXT_WIDTH - // DetectFilter functionality has moved - please update your bookmarks // see sc/source/ui/unoobj/scdetect.cxx, have a nice day. diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 6bd2dcdba209..9c3ae8ce805e 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -374,77 +374,6 @@ void ScModule::DeleteCfg() } //------------------------------------------------------------------ - -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) - -void ScModule::FillStatusBar(StatusBar& rStatusBar) -{ - // Dokumentposition (Tabelle x / y) - rStatusBar.InsertItem( SID_STATUS_DOCPOS, - TEXT_WIDTH( String().Fill( 10, 'X' ) ), - SIB_LEFT|SIB_AUTOSIZE ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_STATUS_DOCPOS, ""/*SID_STATUS_DOCPOS*/ ); - - // Seitenvorlage - rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, - TEXT_WIDTH( String().Fill( 15, 'X' ) ), - SIB_LEFT|SIB_AUTOSIZE ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_STATUS_PAGESTYLE, ""/*SID_STATUS_PAGESTYLE*/ ); - - // Einfuege-/Ueberschreibmodus - rStatusBar.InsertItem( SID_ATTR_INSERT, - SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_INSERT, ""/*SID_ATTR_INSERT*/ ); - - // Selektionsmodus - rStatusBar.InsertItem( SID_STATUS_SELMODE, - SvxSelectionModeControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_STATUS_SELMODE, ""/*SID_STATUS_SELMODE*/ ); - - // Dokument geaendert - rStatusBar.InsertItem( SID_DOC_MODIFIED, - SvxModifyControl::GetDefItemWidth(rStatusBar)); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - // FIXME: HELPID - rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); - - - // FIXME: HELPID - rStatusBar.SetHelpId( SID_DOC_MODIFIED, ""/*SID_DOC_MODIFIED*/ ); - - // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors - rStatusBar.InsertItem( SID_ATTR_SIZE, - SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_SIZE, ""/*SID_ATTR_SIZE*/ ); - - // Ma"sstab - rStatusBar.InsertItem( SID_ATTR_ZOOM, - SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_ZOOM, ""/*SID_ATTR_ZOOM*/ ); - - // ZoomSlider - rStatusBar.InsertItem( SID_ATTR_ZOOMSLIDER, - TEXT_WIDTH( String().Fill( 15, 'X' ) ), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_ZOOMSLIDER, ""/*SID_ATTR_ZOOMSLIDER*/ ); -} - -#undef TEXT_WIDTH - -//------------------------------------------------------------------ // // von der Applikation verschoben: // diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 0af2c30d628f..7bb0a94c9d58 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -597,9 +597,9 @@ USHORT AbstractScShowTabDlg_Impl::GetSelectEntryCount() const } void AbstractScShowTabDlg_Impl::SetDescription( const String& rTitle, const String& rFixedText, - ULONG nDlgHelpId, ULONG nLbHelpId ) + const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ) { - pDlg->SetDescription( rTitle, rFixedText,nDlgHelpId, nLbHelpId ); + pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); } USHORT AbstractScShowTabDlg_Impl::GetSelectEntryPos(USHORT nPos) const { @@ -1274,14 +1274,14 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId , + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, int nId ) { ScStringInputDlg * pDlg=NULL; switch ( nId ) { case RID_SCDLG_STRINPUT : - pDlg = new ScStringInputDlg( pParent, rTitle, rEditTitle,rDefault, nHelpId ); + pDlg = new ScStringInputDlg( pParent, rTitle, rEditTitle, rDefault, sHelpId, sEditHelpId ); break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index d9752c83da9a..9cd77cc61878 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -325,7 +325,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) virtual void Insert( const String& rString, BOOL bSelected ); virtual USHORT GetSelectEntryCount() const; - virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ); + virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ); virtual String GetSelectEntry(USHORT nPos) const; virtual USHORT GetSelectEntryPos(USHORT nPos) const; }; @@ -517,7 +517,7 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId , + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, int nId ); virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src index 5226c22629c6..0ba15ee43445 100644 --- a/sc/source/ui/dbgui/consdlg.src +++ b/sc/source/ui/dbgui/consdlg.src @@ -28,7 +28,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE { OutputSize = TRUE ; - HelpId = SID_OPENDLG_CONSOLIDATE ; + HelpId = CMD_SID_OPENDLG_CONSOLIDATE ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 280 , 154 ) ; diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index ad88d7501663..4ac3fb8d68ad 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -240,8 +240,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, maStartHelper ( maRbAutoStart, maRbManStart, maEdStart, rNullDate ), maEndHelper ( maRbAutoEnd, maRbManEnd, maEdEnd, rNullDate ) { - // FIXME: HELPID - maLbUnits.SetHelpId( ""/*HID_SC_DPDATEGROUP_LB*/ ); + maLbUnits.SetHelpId( HID_SC_DPDATEGROUP_LB ); ResStringArray aArr( ScResId( STR_UNITS ) ); for( USHORT nIdx = 0, nCount = sal::static_int_cast<USHORT>(aArr.Count()); nIdx < nCount; ++nIdx ) maLbUnits.InsertEntry( aArr.GetString( nIdx ) ); diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src index 359c8a92d8e5..2379d15d3eac 100644 --- a/sc/source/ui/dbgui/pivot.src +++ b/sc/source/ui/dbgui/pivot.src @@ -30,7 +30,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT { OutputSize = TRUE ; - HelpId = SID_OPENDLG_PIVOTTABLE ; + HelpId = CMD_SID_OPENDLG_PIVOTTABLE ; Size = MAP_APPFONT ( 336 , 190 ) ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index dfc4e771e637..6b04993ba0bc 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -651,8 +651,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou // *** HIDDEN ITEMS *** - // FIXME: HELPID - maLbHide.SetHelpId( ""/*HID_SC_DPSUBT_HIDE*/ ); + maLbHide.SetHelpId( HID_SC_DPSUBT_HIDE ); InitHideListBox(); // *** HIERARCHY *** diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 221b7781893b..1eca44a787ed 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -332,16 +332,11 @@ void __EXPORT ScDPLayoutDlg::Init() aBtnDrillDown.Check(); } - // FIXME: HELPID - aWndPage.SetHelpId( ""/*HID_SC_DPLAY_PAGE*/ ); - // FIXME: HELPID - aWndCol.SetHelpId( ""/*HID_SC_DPLAY_COLUMN*/ ); - // FIXME: HELPID - aWndRow.SetHelpId( ""/*HID_SC_DPLAY_ROW*/ ); - // FIXME: HELPID - aWndData.SetHelpId( ""/*HID_SC_DPLAY_DATA*/ ); - // FIXME: HELPID - aWndSelect.SetHelpId( ""/*HID_SC_DPLAY_SELECT*/ ); + aWndPage.SetHelpId( HID_SC_DPLAY_PAGE ); + aWndCol.SetHelpId( HID_SC_DPLAY_COLUMN ); + aWndRow.SetHelpId( HID_SC_DPLAY_ROW ); + aWndData.SetHelpId( HID_SC_DPLAY_DATA ); + aWndSelect.SetHelpId( HID_SC_DPLAY_SELECT ); InitFocus(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 0e998ae92732..3ab0cc62bdd2 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; #include "scitems.hxx" #include <sfx2/fcontnr.hxx> #include <editeng/eeitem.hxx> - +#include <sfx2/objface.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> @@ -1182,10 +1182,8 @@ BOOL ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQuer _pParent ? _pParent : GetActiveDialogParent(), &aText ); pDlg->SetText( aTitle ); pDlg->SetMinLen( 1 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*SID_CHG_PROTECT*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_CHG_PROTECT*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(SID_CHG_PROTECT)->GetCommand() ); + pDlg->SetEditHelpId( HID_CHG_PROTECT ); if ( !bProtected ) pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if ( pDlg->Execute() == RET_OK ) diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index b20ceb9841a5..a00665b58189 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -35,19 +35,19 @@ ToolBoxItem\ {\ Identifier = SID_FRAME_TO_TOP ; \ - HelpID = SID_FRAME_TO_TOP ; \ + HelpID = CMD_SID_FRAME_TO_TOP ; \ };\ ToolBoxItem\ {\ Identifier = SID_FRAME_TO_BOTTOM ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ + HelpID = CMD_SID_FRAME_TO_BOTTOM ; \ }; #define MN_RENAME_OBJECT \ MenuItem\ {\ Identifier = SID_RENAME_OBJECT ; \ - HelpId = SID_RENAME_OBJECT ; \ + HelpId = CMD_SID_RENAME_OBJECT ; \ Text [ en-US ] = "Name...";\ }; @@ -56,7 +56,7 @@ MenuItem\ {\ Identifier = SID_TITLE_DESCRIPTION_OBJECT; \ - HelpId = SID_TITLE_DESCRIPTION_OBJECT; \ + HelpId = CMD_SID_TITLE_DESCRIPTION_OBJECT; \ Text [ en-US ] = "Description...";\ }; @@ -77,14 +77,14 @@ MenuItem\ {\ Identifier = SID_FRAME_UP ; \ - HelpId = SID_FRAME_UP ; \ + HelpId = CMD_SID_FRAME_UP ; \ /* ### ACHTUNG: Neuer Text in Resource? W~eiter nach vorn : Weiter nach vorn */\ Text [ en-US ] = "Bring ~Forward" ; \ };\ MenuItem\ {\ Identifier = SID_FRAME_DOWN ; \ - HelpId = SID_FRAME_DOWN ; \ + HelpId = CMD_SID_FRAME_DOWN ; \ /* ### ACHTUNG: Neuer Text in Resource? Weiter ~nach hinten : Weiter nach hinten */\ Text [ en-US ] = "Send Back~ward" ; \ };\ @@ -118,13 +118,13 @@ MenuItem\ {\ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ };\ MenuItem\ {\ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ };\ };\ @@ -135,7 +135,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ - HelpId = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ; \ SubMenu = Menu\ {\ diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f648a1484e8e..9582bac97ba7 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -54,7 +54,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> - +#include <sfx2/msgpool.hxx> +#include <scmod.hxx> // BM/IHA -- #include <cppuhelper/component_context.hxx> @@ -266,7 +267,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( pViewShell->GetWindow(), nSlot, + pFact->CreateInsertObjectDialog( pViewShell->GetWindow(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommandString(), xStorage, &aServerLst ); if ( pDlg ) { diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 0cd8fdd54e4b..4eda5beca4c3 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -35,7 +35,7 @@ MenuItem\ {\ Identifier = SID_TEXT_STANDARD ; \ - HelpID = SID_TEXT_STANDARD ; \ + HelpID = CMD_SID_TEXT_STANDARD ; \ Text [ en-US ] = "~Default" ; \ Text [ x-comment ] = " ";\ }; @@ -46,7 +46,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_STYLE ; \ - HelpID = RID_MN_FORMAT_STYLE ; \ + HelpID = HID_MN_FORMAT_STYLE ; \ Text [ en-US ] = "~Style" ; \ SubMenu = Menu\ {\ @@ -87,14 +87,14 @@ MenuItem\ {\ Identifier = SID_SET_SUPER_SCRIPT ; \ - HelpID = SID_SET_SUPER_SCRIPT ; \ + HelpID = CMD_SID_SET_SUPER_SCRIPT ; \ Text [ en-US ] = "~Superscript" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_SET_SUB_SCRIPT ; \ - HelpID = SID_SET_SUB_SCRIPT ; \ + HelpID = CMD_SID_SET_SUB_SCRIPT ; \ Text [ en-US ] = "S~ubscript" ; \ Text [ x-comment ] = " ";\ };\ @@ -105,7 +105,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_ALGN ; \ - HelpID = RID_MN_FORMAT_ALGN ; \ + HelpID = HID_MN_FORMAT_ALGN ; \ Text [ en-US ] = "~Alignment" ; \ RadioCheck = TRUE ; \ SubMenu = Menu\ @@ -115,7 +115,7 @@ MenuItem\ {\ Identifier = SID_ALIGNLEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Left" ;\ Text [ x-comment ] = " "; \ @@ -123,21 +123,21 @@ MenuItem\ {\ Identifier = SID_ALIGNRIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Right" ;\ };\ MenuItem\ {\ Identifier = SID_ALIGNCENTERHOR ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Centered" ;\ };\ MenuItem\ {\ Identifier = SID_ALIGNBLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Justified" ; \ Text [ x-comment ] = " ";\ @@ -149,7 +149,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_LINESPACE ; \ - HelpID = RID_MN_FORMAT_LINESPACE ; \ + HelpID = HID_MN_FORMAT_LINESPACE ; \ Text [ en-US ] = "~Line Spacing" ; \ _MenuItemFlags = MIB_RADIOCHECK ; \ SubMenu = Menu\ @@ -191,7 +191,7 @@ MenuItem\ {\ Identifier = SID_DRAW_HLINK_EDIT ; \ - HelpID = SID_DRAW_HLINK_EDIT ; \ + HelpID = CMD_SID_DRAW_HLINK_EDIT ; \ Text [ en-US ] = "~Hyperlink..." ; \ }; @@ -199,7 +199,7 @@ MenuItem\ {\ Identifier = SID_DRAW_HLINK_DELETE ; \ - HelpID = SID_DRAW_HLINK_DELETE ; \ + HelpID = CMD_SID_DRAW_HLINK_DELETE ; \ Text [ en-US ] = "~Remove Hyperlink" ; \ }; #endif @@ -208,7 +208,7 @@ MenuItem\ {\ Identifier = SID_DRAWTEXT_ATTR_DLG ; \ - HelpID = SID_DRAWTEXT_ATTR_DLG ; \ + HelpID = CMD_SID_DRAWTEXT_ATTR_DLG ; \ Text [ en-US ] = "Te~xt..." ; \ /* ### ACHTUNG: Neuer Text in Resource? Textattribute fr die selektierten Textobjekte festlegen : Textattribute fr die selektierten Textobjekte festlegen */\ Text [ x-comment ] = " ";\ @@ -218,7 +218,7 @@ MenuItem\ {\ Identifier = SID_ASSIGNMACRO ; \ - HelpID = SID_ASSIGNMACRO ; \ + HelpID = CMD_SID_ASSIGNMACRO ; \ Text [ en-US ] = "Assig~n Macro..." ; \ Text [ x-comment ] = " ";\ }; @@ -227,7 +227,7 @@ MenuItem\ {\ Identifier = SID_ORIGINALSIZE ; \ - HelpId = SID_ORIGINALSIZE ; \ + HelpId = CMD_SID_ORIGINALSIZE ; \ /* ### ACHTUNG: Neuer Text in Resource? Originalgre : Originalgre */\ Text [ en-US ] = "~Original Size" ; \ Text [ x-comment ] = " ";\ @@ -237,7 +237,7 @@ MenuItem\ {\ Identifier = SID_RENAME_OBJECT ; \ - HelpId = SID_RENAME_OBJECT ; \ + HelpId = CMD_SID_RENAME_OBJECT ; \ Text [ en-US ] = "Name...";\ }; @@ -246,7 +246,7 @@ MenuItem\ {\ Identifier = SID_TITLE_DESCRIPTION_OBJECT; \ - HelpId = SID_TITLE_DESCRIPTION_OBJECT; \ + HelpId = CMD_SID_TITLE_DESCRIPTION_OBJECT; \ Text [ en-US ] = "Description...";\ }; @@ -263,14 +263,14 @@ MenuItem\ {\ Identifier = SID_MIRROR_VERTICAL ; \ - HelpId = SID_MIRROR_VERTICAL ; \ + HelpId = CMD_SID_MIRROR_VERTICAL ; \ Text [ en-US ] = "~Vertically" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_MIRROR_HORIZONTAL ; \ - HelpId = SID_MIRROR_HORIZONTAL ; \ + HelpId = CMD_SID_MIRROR_HORIZONTAL ; \ Text [ en-US ] = "~Horizontal" ; \ Text [ x-comment ] = " ";\ };\ @@ -296,7 +296,7 @@ MenuItem\ {\ Identifier = SID_FRAME_UP ; \ - HelpId = SID_FRAME_UP ; \ + HelpId = CMD_SID_FRAME_UP ; \ /* ### ACHTUNG: Neuer Text in Resource? W~eiter nach vorn : Weiter nach vorn */\ Text [ en-US ] = "Bring ~Forward" ; \ Text [ x-comment ] = " ";\ @@ -304,7 +304,7 @@ MenuItem\ {\ Identifier = SID_FRAME_DOWN ; \ - HelpId = SID_FRAME_DOWN ; \ + HelpId = CMD_SID_FRAME_DOWN ; \ /* ### ACHTUNG: Neuer Text in Resource? Weiter ~nach hinten : Weiter nach hinten */\ Text [ en-US ] = "Send Back~ward" ; \ Text [ x-comment ] = " ";\ @@ -340,14 +340,14 @@ MenuItem\ {\ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ Text [ x-comment ] = " ";\ };\ @@ -360,7 +360,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ - HelpId = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ; \ SubMenu = Menu\ {\ @@ -410,150 +410,6 @@ String RID_DRAW_OBJECTBAR Text [ en-US ] = "Drawing Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_DRAW_OBJECTBAR -{ - HelpId = HID_SC_TOOLBOX_DRAW ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_BEZIER_EDIT ; - HelpID = SID_BEZIER_EDIT ; - - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - // Linien - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE ; - HelpId = SID_ATTRIBUTES_LINE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINEEND_STYLE ; - HelpID = SID_ATTR_LINEEND_STYLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_LINE_STYLE ; - HelpId = SID_ATTR_LINE_STYLE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINE_WIDTH ; - HelpId = SID_ATTR_LINE_WIDTH ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINE_COLOR ; - HelpId = SID_ATTR_LINE_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA ; - HelpId = SID_ATTRIBUTES_AREA ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_FILL_STYLE ; - HelpId = SID_ATTR_FILL_STYLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - // Rest - ToolBoxItem - { - Identifier = SID_OBJECT_ROTATE ; - HelpId = SID_OBJECT_ROTATE ; - }; - ToolBoxItem - { - Identifier = SID_ANCHOR_TOGGLE ; - HelpId = SID_ANCHOR_TOGGLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_FRAME_TO_TOP ; - HelpId = SID_FRAME_TO_TOP ; - }; - ToolBoxItem - { - Identifier = SID_FRAME_TO_BOTTOM ; - HelpId = SID_FRAME_TO_BOTTOM ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HEAVEN ; - HelpID = SID_OBJECT_HEAVEN ; - - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HELL ; - HelpID = SID_OBJECT_HELL ; - - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - - ToolBoxItem - { - Identifier = SID_GRID_VISIBLE; - HelpID = SID_GRID_VISIBLE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_GRID_USE; - HelpID = SID_GRID_USE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_HELPLINES_MOVE; - HelpID = SID_HELPLINES_MOVE; - Hide = TRUE; - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN ; - HelpId = SID_OBJECT_ALIGN ; - }; - }; - Scroll = TRUE ; -}; // // Text-Toolbox // @@ -562,504 +418,6 @@ String RID_TEXT_TOOLBOX Text [ en-US ] = "Text Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_TEXT_TOOLBOX -{ - HelpId = HID_SC_TOOLBOX_DRTEXT ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; - ItemList[ ar ] = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; - ItemList[ he ] = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; -}; // // Graphics toolbox // @@ -1067,182 +425,6 @@ String RID_GRAPHIC_OBJECTBAR { Text [ en-US ] = "Graphics Object Bar"; }; -ToolBox RID_GRAPHIC_OBJECTBAR -{ - HelpId = HID_SC_TOOLBOX_GRAPHIC ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GRFFILTER; - HelpID = SID_GRFFILTER; - DropDown = TRUE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_MODE; - HelpID = SID_ATTR_GRAF_MODE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_RED; - HelpID = SID_ATTR_GRAF_RED; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GREEN; - HelpID = SID_ATTR_GRAF_GREEN; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_BLUE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_LUMINANCE; - HelpID = SID_ATTR_GRAF_LUMINANCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CONTRAST; - HelpID = SID_ATTR_GRAF_CONTRAST; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GAMMA; - HelpID = SID_ATTR_GRAF_GAMMA; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_TRANSPARENCE; - HelpID = SID_ATTR_GRAF_TRANSPARENCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - // #i25616# - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE; - HelpID = SID_ATTRIBUTES_LINE; - }; - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA; - HelpID = SID_ATTRIBUTES_AREA; - }; - ToolBoxItem - { - Identifier = SID_ATTR_FILL_SHADOW; - HelpID = SID_ATTR_FILL_SHADOW; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CROP; - HelpID = SID_ATTR_GRAF_CROP; - }; - - // copied from the "normal" drawing toolbar: - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ANCHOR_TOGGLE ; - HelpId = SID_ANCHOR_TOGGLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_FRAME_TO_TOP ; - HelpId = SID_FRAME_TO_TOP ; - }; - ToolBoxItem - { - Identifier = SID_FRAME_TO_BOTTOM ; - HelpId = SID_FRAME_TO_BOTTOM ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HEAVEN ; - HelpID = SID_OBJECT_HEAVEN ; - - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HELL ; - HelpID = SID_OBJECT_HELL ; - - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - - ToolBoxItem - { - Identifier = SID_GRID_VISIBLE; - HelpID = SID_GRID_VISIBLE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_GRID_USE; - HelpID = SID_GRID_USE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_HELPLINES_MOVE; - HelpID = SID_HELPLINES_MOVE; - Hide = TRUE; - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN ; - HelpId = SID_OBJECT_ALIGN ; - }; - }; -}; // // Popup-Menues --------------------------------------------------------------------- // @@ -1413,36 +595,6 @@ Menu RID_POPUP_MEDIA }; }; -ToolBox RID_MEDIA_OBJECTBAR -{ - //HelpId = HID_SC_TOOLBOX_MEDIA ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_AVMEDIA_TOOLBOX; - HelpID = SID_AVMEDIA_TOOLBOX; - DropDown = FALSE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - }; -}; - // // Ole-Objekt // diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 6c89c43b3a51..00ebb8a7c480 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -59,7 +59,7 @@ public: /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( const String& rTitle, const String& rFixedText, - ULONG nDlgHelpId, ULONG nLbHelpId ); + const ::rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ); /** Inserts a string into the ListBox. */ void Insert( const String& rString, BOOL bSelected ); diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index f84d8e4e2b51..b5dd140a4109 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -46,7 +46,7 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId ); + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ); ~ScStringInputDlg(); void GetInputString( String& rString ) const; diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src index cad4747acb63..87bec60a63b5 100644 --- a/sc/source/ui/miscdlgs/acredlin.src +++ b/sc/source/ui/miscdlgs/acredlin.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_CHANGES { OutputSize = TRUE ; - HelpId = FID_CHG_ACCEPT ; + HelpId = CMD_FID_CHG_ACCEPT ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 282 , 142 ) ; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 19aedcece154..4c544954b2bc 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -690,13 +690,10 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pActiveWin(NULL) { m_aHelper.SetWindow(/*this*/&m_rWindow); - // FIXME: HELPID - #if 0 - if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + if(m_rWindow.GetHelpId().getLength()==0) //Hack, da im SfxModelessDialog die HelpId m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. - #endif aTimer.SetTimeout(200); aTimer.SetTimeoutHdl(LINK( this, ScRefHandler, UpdateFocusHdl)); diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index a244a3e2a44e..6a3c4ce1da5e 100644 --- a/sc/source/ui/miscdlgs/highred.src +++ b/sc/source/ui/miscdlgs/highred.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES { OutputSize = TRUE ; - HelpId = FID_CHG_ACCEPT ; + HelpId = CMD_FID_CHG_ACCEPT ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 318 , 148 ) ; diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index f01779730fbf..48e33622e99f 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -76,8 +76,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : { FreeResource(); - // FIXME: HELPID - aCbUrl.SetHelpId( ""/*HID_SCDLG_LINKAREAURL*/ ); // SvtURLBox ctor always sets SID_OPENURL + aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL aCbUrl.SetSelectHdl( LINK( this, ScLinkedAreaDlg, FileHdl ) ); aBtnBrowse.SetClickHdl( LINK( this, ScLinkedAreaDlg, BrowseHdl ) ); aLbRanges.SetSelectHdl( LINK( this, ScLinkedAreaDlg, RangeHdl ) ); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index b2f837db4cb4..1b14b15e24c8 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -262,7 +262,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) aStrTitle, aStrLabel, aFormatName, - HID_SC_ADD_AUTOFMT ); + HID_SC_ADD_AUTOFMT, HID_SC_AUTOFMT_NAME ); if ( pDlg->Execute() == RET_OK ) { @@ -369,7 +369,7 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) aStrRename, aStrLabel, aFormatName, - HID_SC_REN_AFMT_DLG ); + HID_SC_REN_AFMT_DLG, HID_SC_REN_AFMT_NAME ); if( pDlg->Execute() == RET_OK ) { BOOL bFmtRenamed = FALSE; diff --git a/sc/source/ui/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.src index fe55ee58c8e4..05be4a5506dc 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.src +++ b/sc/source/ui/miscdlgs/sharedocdlg.src @@ -30,7 +30,7 @@ ModalDialog RID_SCDLG_SHAREDOCUMENT { OutputSize = TRUE ; - HelpId = SID_SHARE_DOC ; + HelpId = CMD_SID_SHARE_DOC ; SVLook = TRUE ; Size = MAP_APPFONT ( 204 , 186 ) ; Text [ en-US ] = "Share Document" ; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 46807c6754a7..99f3ba5ad444 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -62,16 +62,12 @@ ScShowTabDlg::ScShowTabDlg( Window* pParent ) : void ScShowTabDlg::SetDescription( const String& rTitle, const String& rFixedText, - ULONG nDlgHelpId, ULONG nLbHelpId ) + const rtl::OString& rDlgHelpId, const rtl::OString& sLbHelpId ) { SetText( rTitle ); aFtLbTitle.SetText( rFixedText ); - // FIXME: HELPID - SetHelpId( ""/*nDlgHelpId*/ ); - (void)nDlgHelpId; - // FIXME: HELPID - aLb.SetHelpId( ""/*nLbHelpId*/ ); - (void)nLbHelpId; + SetHelpId( rDlgHelpId ); + aLb.SetHelpId( sLbHelpId ); } void ScShowTabDlg::Insert( const String& rString, BOOL bSelected ) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 8b209665606c..418a88b3cbea 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -146,8 +146,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, maBtnEdit.SetClickHdl( LINK( this, ScSolverOptionsDialog, ButtonHdl ) ); maLbSettings.SetWindowBits( WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - maLbSettings.SetHelpId( ""/*HID_SC_SOLVEROPTIONS_LB*/ ); + maLbSettings.SetHelpId( HID_SC_SOLVEROPTIONS_LB ); maLbSettings.SetHighlightRange(); maLbSettings.SetSelectHdl( LINK( this, ScSolverOptionsDialog, SettingsSelHdl ) ); diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index 1d625d81cf7c..db042d9b3a6d 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -55,7 +55,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId ) : + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ) : ModalDialog ( pParent, ScResId( RID_SCDLG_STRINPUT ) ), // aFtEditTitle ( this, ScResId( FT_LABEL ) ), @@ -64,37 +64,12 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) { - // FIXME: HELPID - SetHelpId( ""/*nHelpId*/ ); + SetHelpId( sHelpId ); SetText( rTitle ); aFtEditTitle.SetText( rEditTitle ); aEdInput.SetText( rDefault ); aEdInput.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); - - // HelpId for Edit different for different uses - - if ( nHelpId == FID_TAB_APPEND ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_APPEND_NAME*/ ); - else if ( nHelpId == FID_TAB_RENAME ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_RENAME_NAME*/ ); - else if ( nHelpId == HID_SC_ADD_AUTOFMT ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_AUTOFMT_NAME*/ ); - else if ( nHelpId == HID_SC_REN_AFMT_DLG ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_REN_AFMT_NAME*/ ); - else if ( nHelpId == SID_RENAME_OBJECT ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/* HID_SC_RENAME_OBJECT*/ ); - // #i68101# - else if ( nHelpId == SID_TITLE_DESCRIPTION_OBJECT ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_TITLE_DESCRIPTION_OBJECT*/ ); - else - DBG_ERRORFILE( "unknown ID" ); - + aEdInput.SetHelpId( sEditHelpId ); //------------- FreeResource(); } diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index b03db3c35286..24b2e62a1c78 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -70,8 +70,7 @@ void ScCbWarningBox::DisableDialog() ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, String( ScResId( STR_REPLCELLSWARN ) ), true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_SC_REPLCELLSWARN*/ ); + SetHelpId( HID_SC_REPLCELLSWARN ); } bool ScReplaceWarnBox::IsDialogEnabled() diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 38ff9760b742..e7dff0bf37c7 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -225,10 +225,8 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent,const String& aQH_List, aEdComment.SetFont( aFont ); aEdComment.SetMaxTextLen( 512 ); aLbScenario.SetPosPixel( Point(0,0) ); - // FIXME: HELPID - aLbScenario.SetHelpId(""/*HID_SC_SCENWIN_TOP*/); - // FIXME: HELPID - aEdComment.SetHelpId(""/*HID_SC_SCENWIN_BOTTOM*/); + aLbScenario.SetHelpId(HID_SC_SCENWIN_TOP); + aEdComment.SetHelpId(HID_SC_SCENWIN_BOTTOM); aLbScenario.Show(); aEdComment.Show(); diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src index 1445636e8cc6..7e70dd9bfe66 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.src +++ b/sc/source/ui/pagedlg/hfedtdlg.src @@ -70,13 +70,13 @@ TabDialog RID_SCDLG_HFED_HEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -101,13 +101,13 @@ TabDialog RID_SCDLG_HFED_FOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 2 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -135,25 +135,25 @@ TabDialog RID_SCDLG_HFEDIT_ALL { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; PageItem { Identifier = 3 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 4 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -178,19 +178,19 @@ TabDialog RID_SCDLG_HFEDIT_SHDR { Identifier = 1 ; HEADER - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 3 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -215,19 +215,19 @@ TabDialog RID_SCDLG_HFEDIT_SFTR { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; PageItem { Identifier = 3 ; FOOTER - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -252,13 +252,13 @@ TabDialog RID_SCDLG_HFEDIT { Identifier = 1 ; HEADER - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; FOOTER - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -283,13 +283,13 @@ TabDialog RID_SCDLG_HFEDIT_HEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -314,13 +314,13 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 2 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -345,7 +345,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; }; }; @@ -370,7 +370,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER { Identifier = 1 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -395,7 +395,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -420,7 +420,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER { Identifier = 1 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 86f06246794e..de647cf5f82a 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -98,11 +98,9 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, aTurnOnBox.SetClickHdl ( LINK( this, ScHFPage, TurnOnHdl ) ); if ( nId == SID_ATTR_PAGE_HEADERSET ) - // FIXME: HELPID - aBtnEdit.SetHelpId( ""/*HID_SC_HEADER_EDIT*/ ); + aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT ); else - // FIXME: HELPID - aBtnEdit.SetHelpId( ""/*HID_SC_FOOTER_EDIT*/ ); + aBtnEdit.SetHelpId( HID_SC_FOOTER_EDIT ); } //------------------------------------------------------------------ diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src index cb56f6ac85a4..7846b79cc32f 100644 --- a/sc/source/ui/src/autofmt.src +++ b/sc/source/ui/src/autofmt.src @@ -30,7 +30,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT { OutputSize = TRUE ; - HelpId = SID_AUTOFORMAT ; + HelpId = CMD_SID_AUTOFORMAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 312 , 121 ) ; /* ### ACHTUNG: Neuer Text in Resource? AutoFormat : Autoformat */ diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src index 50152d95d9d5..0ca03ec8b78b 100644 --- a/sc/source/ui/src/dbnamdlg.src +++ b/sc/source/ui/src/dbnamdlg.src @@ -28,7 +28,7 @@ ModelessDialog RID_SCDLG_DBNAMES { OutputSize = TRUE ; - HelpId = SID_DEFINE_DBNAME ; + HelpId = CMD_SID_DEFINE_DBNAME ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 142 ) ; diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src index 52ce38db1516..7be3461cf4af 100644 --- a/sc/source/ui/src/filter.src +++ b/sc/source/ui/src/filter.src @@ -28,7 +28,7 @@ ModelessDialog RID_SCDLG_FILTER { OutputSize = TRUE ; - HelpId = SID_FILTER ; + HelpId = CMD_SID_FILTER ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 279 , 121 ) ; @@ -423,7 +423,7 @@ ModelessDialog RID_SCDLG_FILTER ModelessDialog RID_SCDLG_SPEC_FILTER { OutputSize = TRUE ; - HelpId = SID_SPECIAL_FILTER ; + HelpId = CMD_SID_SPECIAL_FILTER ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 278 , 83 ) ; diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index e4a82d38ec98..c4edc13e2f6f 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -32,7 +32,7 @@ MenuItem\ {\ Identifier = FID_CELL_FORMAT ; \ - HelpId = FID_CELL_FORMAT ; \ + HelpId = CMD_FID_CELL_FORMAT ; \ Text [ en-US ] = "~Format Cells..." ; \ }; @@ -41,20 +41,20 @@ MenuItem\ {\ Identifier = SID_CUT ; \ - HelpId = SID_CUT ; \ + HelpId = CMD_SID_CUT ; \ Text [ en-US ] = "Cu~t" ; \ /* ### ACHTUNG: Neuer Text in Resource? Die Selektion in die Zwischenablage kopieren und lschen : Die Selektion in die Zwischenablage kopieren und lschen */\ };\ MenuItem\ {\ Identifier = SID_COPY ; \ - HelpId = SID_COPY ; \ + HelpId = CMD_SID_COPY ; \ Text [ en-US ] = "~Copy" ; \ };\ MenuItem\ {\ Identifier = SID_PASTE ; \ - HelpId = SID_PASTE ; \ + HelpId = CMD_SID_PASTE ; \ /* ### ACHTUNG: Neuer Text in Resource? Einfgen : Einfgen */\ Text [ en-US ] = "~Paste" ; \ /* ### ACHTUNG: Neuer Text in Resource? Den Inhalt der Zwischenablage einfgen : Den Inhalt der Zwischenablage einfgen */\ @@ -73,14 +73,14 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = FID_ROW_HEIGHT ; - HelpId = FID_ROW_HEIGHT ; + HelpId = CMD_FID_ROW_HEIGHT ; /* ### ACHTUNG: Neuer Text in Resource? Zeilenhhe... : Zeilenhhe... */ Text [ en-US ] = "Row Hei~ght..." ; }; MenuItem { Identifier = FID_ROW_OPT_HEIGHT ; - HelpId = FID_ROW_OPT_HEIGHT ; + HelpId = CMD_FID_ROW_OPT_HEIGHT ; /* ### ACHTUNG: Neuer Text in Resource? Optimale Zeilenhhe... : Optimale Zeilenhhe... */ Text [ en-US ] = "Optimal ~Row Height..." ; /* ### ACHTUNG: Neuer Text in Resource? Optimale Zeilenhhe einstellen : Optimale Zeilenhhe einstellen */ @@ -91,7 +91,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = FID_INS_ROW ; - HelpId = FID_INS_ROW ; + HelpId = CMD_FID_INS_ROW ; /* ### ACHTUNG: Neuer Text in Resource? Zeilen einfgen : Zeilen einfgen */ Text [ en-US ] = "~Insert Rows" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Zeilen einfgen : Ganze Zeilen einfgen */ @@ -99,7 +99,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = SID_DEL_ROWS ; - HelpId = SID_DEL_ROWS ; + HelpId = CMD_SID_DEL_ROWS ; /* ### ACHTUNG: Neuer Text in Resource? Zeilen lschen : Zeilen lschen */ Text [ en-US ] = "~Delete Rows" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Zeilen lschen : Ganze Zeilen lschen */ @@ -107,7 +107,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = SID_DELETE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; /* ### ACHTUNG: Neuer Text in Resource? Inhalte l~schen... : Inhalte l~schen... */ Text [ en-US ] = "De~lete Contents..." ; /* ### ACHTUNG: Neuer Text in Resource? Ausgewhlte Inhalte lschen (Formeln, Formate etc.) : Ausgewhlte Inhalte lschen (Formeln, Formate etc.) */ @@ -118,13 +118,13 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = FID_ROW_HIDE ; - HelpId = FID_ROW_HIDE ; + HelpId = CMD_FID_ROW_HIDE ; Text [ en-US ] = "~Hide" ; }; MenuItem { Identifier = FID_ROW_SHOW ; - HelpId = FID_ROW_SHOW ; + HelpId = CMD_FID_ROW_SHOW ; Text [ en-US ] = "~Show" ; }; //------------------------------ @@ -134,7 +134,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = SID_PASTE_SPECIAL ; - HelpId = SID_PASTE_SPECIAL ; + HelpId = CMD_SID_PASTE_SPECIAL ; Text [ en-US ] = "P~aste Special..." ; }; }; @@ -153,14 +153,14 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = FID_COL_WIDTH ; - HelpId = FID_COL_WIDTH ; + HelpId = CMD_FID_COL_WIDTH ; Text [ en-US ] = "Col~umn Width..." ; /* ### ACHTUNG: Neuer Text in Resource? Spaltenbreite ndern : Spaltenbreite ndern */ }; MenuItem { Identifier = FID_COL_OPT_WIDTH ; - HelpId = FID_COL_OPT_WIDTH ; + HelpId = CMD_FID_COL_OPT_WIDTH ; Text [ en-US ] = "O~ptimal Column Width..." ; }; //------------------------------ @@ -169,7 +169,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = FID_INS_COLUMN ; - HelpId = FID_INS_COLUMN ; + HelpId = CMD_FID_INS_COLUMN ; /* ### ACHTUNG: Neuer Text in Resource? Spalten einfgen : Spalten einfgen */ Text [ en-US ] = "~Insert Columns" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Spalten einfgen : Ganze Spalten einfgen */ @@ -177,7 +177,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = SID_DEL_COLS ; - HelpId = SID_DEL_COLS ; + HelpId = CMD_SID_DEL_COLS ; /* ### ACHTUNG: Neuer Text in Resource? Spalten lschen : Spalten lschen */ Text [ en-US ] = "~Delete Columns" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Spalten lschen : Ganze Spalten lschen */ @@ -185,7 +185,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = SID_DELETE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; /* ### ACHTUNG: Neuer Text in Resource? Inhalte l~schen... : Inhalte l~schen... */ Text [ en-US ] = "D~elete Contents..." ; /* ### ACHTUNG: Neuer Text in Resource? Ausgewhlte Inhalte lschen (Formeln, Formate etc.) : Ausgewhlte Inhalte lschen (Formeln, Formate etc.) */ @@ -196,13 +196,13 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = FID_COL_HIDE ; - HelpId = FID_COL_HIDE ; + HelpId = CMD_FID_COL_HIDE ; Text [ en-US ] = "~Hide" ; }; MenuItem { Identifier = FID_COL_SHOW ; - HelpId = FID_COL_SHOW ; + HelpId = CMD_FID_COL_SHOW ; Text [ en-US ] = "~Show" ; }; //------------------------------ @@ -212,7 +212,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = SID_PASTE_SPECIAL ; - HelpId = SID_PASTE_SPECIAL ; + HelpId = CMD_SID_PASTE_SPECIAL ; Text [ en-US ] = "Paste ~Special..." ; }; }; diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src index 8c9279a602c1..efa6760d5079 100644 --- a/sc/source/ui/src/miscdlgs.src +++ b/sc/source/ui/src/miscdlgs.src @@ -30,7 +30,7 @@ ModalDialog RID_SCDLG_DELCELL { OutputSize = TRUE ; - HelpId = FID_DELETE_CELL ; + HelpId = CMD_FID_DELETE_CELL ; SVLook = TRUE ; Size = MAP_APPFONT ( 191 , 70 ) ; Text [ en-US ] = "Delete Cells" ; @@ -93,7 +93,7 @@ ModalDialog RID_SCDLG_DELCELL ModalDialog RID_SCDLG_INSCELL { OutputSize = TRUE ; - HelpId = FID_INS_CELL ; + HelpId = CMD_FID_INS_CELL ; SVLook = TRUE ; Size = MAP_APPFONT ( 191 , 70 ) ; Text [ en-US ] = "Insert Cells" ; @@ -162,7 +162,7 @@ Bitmap RID_SCTEAMDLGBMP1 ModalDialog RID_SCDLG_DELCONT { OutputSize = TRUE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; SVLook = TRUE ; Size = MAP_APPFONT ( 161 , 130 ) ; Text [ en-US ] = "Delete Contents" ; @@ -255,7 +255,7 @@ ModalDialog RID_SCDLG_DELCONT ModalDialog RID_SCDLG_INSCONT { OutputSize = TRUE ; - HelpId = FID_INS_CELL_CONTENTS ; + HelpId = CMD_FID_INS_CELL_CONTENTS ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 187 ) ; Text [ en-US ] = "Paste Special" ; @@ -440,7 +440,7 @@ ModalDialog RID_SCDLG_INSCONT ModalDialog RID_SCDLG_MOVETAB { OutputSize = TRUE ; - HelpId = FID_TAB_MOVE ; + HelpId = CMD_FID_TAB_MOVE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 130 ) ; Text [ en-US ] = "Move/Copy Sheet" ; @@ -601,7 +601,7 @@ ModalDialog RID_SCDLG_COL_MAN { Text [ en-US ] = "Column Width" ; - HelpId = FID_COL_WIDTH ; + HelpId = CMD_FID_COL_WIDTH ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -655,7 +655,7 @@ ModalDialog RID_SCDLG_COL_OPT { Text [ en-US ] = "Optimal Column Width" ; - HelpId = FID_COL_OPT_WIDTH ; + HelpId = CMD_FID_COL_OPT_WIDTH ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -710,7 +710,7 @@ ModalDialog RID_SCDLG_ROW_MAN { Text [ en-US ] = "Row Height" ; - HelpId = FID_ROW_HEIGHT ; + HelpId = CMD_FID_ROW_HEIGHT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -765,7 +765,7 @@ ModalDialog RID_SCDLG_ROW_OPT { Text [ en-US ] = "Optimal Row Height" ; - HelpId = FID_ROW_OPT_HEIGHT ; + HelpId = CMD_FID_ROW_OPT_HEIGHT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -821,7 +821,7 @@ ModalDialog RID_SCDLG_ROW_OPT ModalDialog RID_SCDLG_SELECTDB { - HelpId = SID_SELECT_DB ; + HelpId = CMD_SID_SELECT_DB ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 100 ) ; @@ -866,7 +866,7 @@ ModalDialog RID_SCDLG_SELECTDB ModalDialog RID_SCDLG_SHOW_TAB { - HelpId = FID_TABLE_SHOW ; + HelpId = CMD_FID_TABLE_SHOW ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 100 ) ; @@ -913,7 +913,7 @@ ModalDialog RID_SCDLG_SHOW_TAB ModalDialog RID_SCDLG_FILLSERIES { OutputSize = TRUE ; - HelpId = FID_FILL_SERIES ; + HelpId = CMD_FID_FILL_SERIES ; SVLook = TRUE ; Size = MAP_APPFONT ( 290 , 122 ) ; Text [ en-US ] = "Fill Series" ; @@ -1165,8 +1165,8 @@ ModalDialog RID_SCDLG_GROUP }; // Ableitungen -ModalDialog RID_SCDLG_GRP_MAKE < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_MAKE ; }; -ModalDialog RID_SCDLG_GRP_KILL < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_REMOVE ; }; +ModalDialog RID_SCDLG_GRP_MAKE < RID_SCDLG_GROUP { HelpId = CMD_SID_OUTLINE_MAKE ; }; +ModalDialog RID_SCDLG_GRP_KILL < RID_SCDLG_GROUP { HelpId = CMD_SID_OUTLINE_REMOVE ; }; // RID_SCDLG_COLORROW wird nur in der Optionen-Sortierlisten-Seite benutzt @@ -1221,7 +1221,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE { OutputSize = TRUE ; SVLook = TRUE ; - HelpID = FID_USE_NAME ; + HelpID = CMD_FID_USE_NAME ; Size = MAP_APPFONT ( 174 , 72 ) ; Moveable = TRUE ; CheckBox BTN_TOP @@ -1283,7 +1283,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE ModalDialog RID_SCDLG_NAMES_PASTE { OutputSize = TRUE ; - HelpId = FID_INSERT_NAME ; + HelpId = CMD_FID_INSERT_NAME ; SVLook = TRUE ; Size = MAP_APPFONT ( 228 , 85 ) ; Moveable = TRUE ; diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src index 38e1271b2959..b7a23fb69b65 100644 --- a/sc/source/ui/src/namedlg.src +++ b/sc/source/ui/src/namedlg.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_NAMES { OutputSize = TRUE ; - HelpId = FID_DEFINE_NAME ; + HelpId = CMD_FID_DEFINE_NAME ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 142 ) ; diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src index a8c2daf4892a..a0258fc0c029 100644 --- a/sc/source/ui/src/opredlin.src +++ b/sc/source/ui/src/opredlin.src @@ -35,7 +35,7 @@ TabPage RID_SCPAGE_OPREDLINE Size = MAP_APPFONT ( 260 , 185 ) ; FixedText FT_CONTENT { - HelpID = 1 ; + HelpID = HID_SCPAGE_OPREDLINBE_FT_CONTENT ; Pos = MAP_APPFONT ( 12 , 15 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Chan~ges" ; diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src index 2fc5cf3a3c54..e0c8ba382bc6 100644 --- a/sc/source/ui/src/optsolver.src +++ b/sc/source/ui/src/optsolver.src @@ -30,7 +30,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER { OutputSize = TRUE ; - HelpId = SID_OPENDLG_OPTSOLVER ; + HelpId = CMD_SID_OPENDLG_OPTSOLVER ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 230 , 210 ) ; diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index abda5c9a0994..079c4d538c4c 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -43,7 +43,7 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_CELL_FORMAT_RESET ; - HelpId = SID_CELL_FORMAT_RESET ; + HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default Formatting" ; }; //------------------------------ @@ -52,7 +52,7 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = FID_CELL_FORMAT ; - HelpId = FID_CELL_FORMAT ; + HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; //------------------------------ @@ -61,19 +61,19 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = FID_INS_CELL ; - HelpId = FID_INS_CELL ; + HelpId = CMD_FID_INS_CELL ; Text [ en-US ] = "~Insert..." ; }; MenuItem { Identifier = FID_DELETE_CELL ; - HelpId = FID_DELETE_CELL ; + HelpId = CMD_FID_DELETE_CELL ; Text [ en-US ] = "De~lete..." ; }; MenuItem { Identifier = SID_DELETE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; Text [ en-US ] = "Delete C~ontents..." ; }; //------------------------------ @@ -82,19 +82,19 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_INSERT_POSTIT ; - HelpId = SID_INSERT_POSTIT ; + HelpId = CMD_SID_INSERT_POSTIT ; Text [ en-US ] = "Insert Co~mment" ; }; MenuItem { Identifier = SID_DELETE_NOTE ; - HelpId = SID_DELETE_NOTE ; + HelpId = CMD_SID_DELETE_NOTE ; Text [ en-US ] = "D~elete Comment" ; }; MenuItem { Identifier = FID_NOTE_VISIBLE ; - HelpId = FID_NOTE_VISIBLE ; + HelpId = CMD_FID_NOTE_VISIBLE ; Text [ en-US ] = "Sho~w Comment" ; }; //------------------------------ @@ -104,27 +104,27 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_CUT ; - HelpId = SID_CUT ; + HelpId = CMD_SID_CUT ; Text [ en-US ] = "Cu~t" ; }; MenuItem { Identifier = SID_COPY ; - HelpId = SID_COPY ; + HelpId = CMD_SID_COPY ; Text [ en-US ] = "~Copy" ; }; MenuItem { Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + HelpID = CMD_SID_PASTE ; Text [ en-US ] = "~Paste" ; }; MenuItem { Identifier = SID_PASTE_SPECIAL ; - HelpId = SID_PASTE_SPECIAL ; + HelpId = CMD_SID_PASTE_SPECIAL ; Text [ en-US ] = "P~aste Special..." ; }; //------------------------------ @@ -133,7 +133,7 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_DATA_SELECT ; - HelpId = SID_DATA_SELECT ; + HelpId = CMD_SID_DATA_SELECT ; Text [ en-US ] = "~Selection List..." ; }; }; @@ -151,43 +151,43 @@ Menu RID_POPUP_TAB MenuItem { Identifier = FID_INS_TABLE ; - HelpId = FID_INS_TABLE ; + HelpId = CMD_FID_INS_TABLE ; Text [ en-US ] = "~Insert Sheet..." ; }; MenuItem { Identifier = FID_DELETE_TABLE ; - HelpId = FID_DELETE_TABLE ; + HelpId = CMD_FID_DELETE_TABLE ; Text [ en-US ] = "~Delete Sheet..." ; }; MenuItem { Identifier = FID_TAB_MENU_RENAME ; - HelpId = FID_TAB_MENU_RENAME ; + HelpId = CMD_FID_TAB_MENU_RENAME ; Text [ en-US ] = "~Rename Sheet..." ; }; MenuItem { Identifier = FID_TAB_MOVE ; - HelpId = FID_TAB_MOVE ; + HelpId = CMD_FID_TAB_MOVE ; Text [ en-US ] = "~Move/Copy Sheet..." ; }; MenuItem { Identifier = FID_TAB_SELECTALL ; - HelpId = FID_TAB_SELECTALL ; + HelpId = CMD_FID_TAB_SELECTALL ; Text [ en-US ] = "Select All S~heets" ; }; MenuItem { Identifier = FID_TAB_DESELECTALL ; - HelpId = FID_TAB_DESELECTALL ; + HelpId = CMD_FID_TAB_DESELECTALL ; Text [ en-US ] = "D~eselect All Sheets" ; }; MenuItem { Identifier = FID_TAB_RTL ; - HelpId = FID_TAB_RTL ; + HelpId = CMD_FID_TAB_RTL ; Text [ en-US ] = "S~heet Right-To-Left" ; }; }; @@ -205,25 +205,25 @@ Menu RID_POPUP_PIVOT MenuItem { Identifier = SID_OPENDLG_PIVOTTABLE ; - HelpId = SID_OPENDLG_PIVOTTABLE ; + HelpId = CMD_SID_OPENDLG_PIVOTTABLE ; Text [ en-US ] = "~Start..." ; }; MenuItem { Identifier = SID_PIVOT_RECALC ; - HelpId = SID_PIVOT_RECALC ; + HelpId = CMD_SID_PIVOT_RECALC ; Text [ en-US ] = "~Refresh" ; }; MenuItem { Identifier = SID_DP_FILTER ; - HelpId = SID_DP_FILTER ; + HelpId = CMD_SID_DP_FILTER ; Text [ en-US ] = "~Filter..." ; }; MenuItem { Identifier = SID_PIVOT_KILL ; - HelpId = SID_PIVOT_KILL ; + HelpId = CMD_SID_PIVOT_KILL ; Text [ en-US ] = "~Delete" ; }; }; @@ -241,32 +241,32 @@ Menu RID_POPUP_PREVIEW MenuItem { Identifier = SID_PREVIEW_PREVIOUS ; - HelpId = SID_PREVIEW_PREVIOUS ; + HelpId = CMD_SID_PREVIEW_PREVIOUS ; Text [ en-US ] = "~Previous Page" ; }; MenuItem { Identifier = SID_PREVIEW_NEXT ; - HelpId = SID_PREVIEW_NEXT ; + HelpId = CMD_SID_PREVIEW_NEXT ; Text [ en-US ] = "~Next Page" ; }; MenuItem { Identifier = SID_FORMATPAGE ; - HelpId = SID_FORMATPAGE ; + HelpId = CMD_SID_FORMATPAGE ; Text [ en-US ] = "Pa~ge Layout..." ; }; MenuItem { Identifier = SID_CLOSEWIN ; - HelpId = SID_CLOSEWIN ; + HelpId = CMD_SID_CLOSEWIN ; Text [ en-US ] = "~Close" ; }; MenuItem { Separator = TRUE; }; MenuItem { Identifier = SID_PREVIEW_CLOSE ; - HelpId = SID_PRINTPREVIEW ; + HelpId = CMD_SID_PRINTPREVIEW ; Text [ en-US ] = "Close Pre~view" ; }; }; @@ -285,7 +285,7 @@ Menu RID_POPUP_EDIT MenuItem { Identifier = SID_CELL_FORMAT_RESET ; - HelpId = SID_CELL_FORMAT_RESET ; + HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; //------------------------------ @@ -309,7 +309,7 @@ Menu RID_POPUP_EDIT { Text [ en-US ] = "Style" ; Identifier = RID_MN_FORMAT_STYLE ; - HelpID = RID_MN_FORMAT_STYLE ; + HelpID = HID_MN_FORMAT_STYLE ; SubMenu = Menu { ItemList = @@ -333,7 +333,7 @@ Menu RID_POPUP_EDIT MenuItem { Identifier = SID_ULINE_VAL_DOUBLE ; - HelpID = SID_ULINE_VAL_DOUBLE ; + HelpID = CMD_SID_ULINE_VAL_DOUBLE ; Text [ en-US ] = "Do~uble Underline" ; }; MenuItem @@ -355,13 +355,13 @@ Menu RID_POPUP_EDIT MenuItem { Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; + HelpID = CMD_SID_SET_SUPER_SCRIPT ; Text [ en-US ] = "Su~perscript" ; }; MenuItem { Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; + HelpID = CMD_SID_SET_SUB_SCRIPT ; Text [ en-US ] = "Su~bscript" ; }; }; @@ -397,37 +397,37 @@ Menu RID_POPUP_AUDIT MenuItem { Identifier = SID_FILL_ADD_PRED ; - HelpId = SID_FILL_ADD_PRED ; + HelpId = CMD_SID_FILL_ADD_PRED ; Text [ en-US ] = "Trace ~Precedent" ; }; MenuItem { Identifier = SID_FILL_DEL_PRED ; - HelpId = SID_FILL_DEL_PRED ; + HelpId = CMD_SID_FILL_DEL_PRED ; Text [ en-US ] = "~Remove Precedent" ; }; MenuItem { Identifier = SID_FILL_ADD_SUCC ; - HelpId = SID_FILL_ADD_SUCC ; + HelpId = CMD_SID_FILL_ADD_SUCC ; Text [ en-US ] = "~Trace Dependent" ; }; MenuItem { Identifier = SID_FILL_DEL_SUCC ; - HelpId = SID_FILL_DEL_SUCC ; + HelpId = CMD_SID_FILL_DEL_SUCC ; Text [ en-US ] = "Remove Dependent" ; }; MenuItem { Identifier = SID_DETECTIVE_DEL_ALL ; - HelpId = SID_DETECTIVE_DEL_ALL ; + HelpId = CMD_SID_DETECTIVE_DEL_ALL ; Text [ en-US ] = "Remove ~All Traces" ; }; MenuItem { Identifier = SID_FILL_NONE ; - HelpId = SID_FILL_NONE ; + HelpId = CMD_SID_FILL_NONE ; Text [ en-US ] = "Exit Fill Mode" ; }; }; @@ -445,7 +445,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = SID_CELL_FORMAT_RESET ; - HelpId = SID_CELL_FORMAT_RESET ; + HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; //------------------------------ @@ -454,7 +454,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = FID_CELL_FORMAT ; - HelpId = FID_CELL_FORMAT ; + HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; //------------------------------ @@ -463,25 +463,25 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = FID_INS_ROWBRK ; - HelpId = FID_INS_ROWBRK ; + HelpId = CMD_FID_INS_ROWBRK ; Text [ en-US ] = "Insert ~Row Break" ; }; MenuItem { Identifier = FID_INS_COLBRK ; - HelpId = FID_INS_COLBRK ; + HelpId = CMD_FID_INS_COLBRK ; Text [ en-US ] = "Insert ~Column Break" ; }; MenuItem { Identifier = FID_DEL_MANUALBREAKS ; - HelpId = FID_DEL_MANUALBREAKS ; + HelpId = CMD_FID_DEL_MANUALBREAKS ; Text [ en-US ] = "Delete All Manual Breaks" ; }; MenuItem { Identifier = FID_RESET_PRINTZOOM ; - HelpId = FID_RESET_PRINTZOOM ; + HelpId = CMD_FID_RESET_PRINTZOOM ; Text [ en-US ] = "Reset Scale" ; }; //------------------------------ @@ -490,19 +490,19 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = SID_DEFINE_PRINTAREA ; - HelpId = SID_DEFINE_PRINTAREA ; + HelpId = CMD_SID_DEFINE_PRINTAREA ; Text [ en-US ] = "Define Print Range" ; }; MenuItem { Identifier = SID_ADD_PRINTAREA ; - HelpId = SID_ADD_PRINTAREA ; + HelpId = CMD_SID_ADD_PRINTAREA ; Text [ en-US ] = "Add Print Range" ; }; MenuItem { Identifier = SID_DELETE_PRINTAREA ; - HelpId = SID_DELETE_PRINTAREA ; + HelpId = CMD_SID_DELETE_PRINTAREA ; Text [ en-US ] = "Undo Print Range" ; }; //------------------------------ @@ -511,7 +511,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = SID_FORMATPAGE ; - HelpId = SID_FORMATPAGE ; + HelpId = CMD_SID_FORMATPAGE ; Text [ en-US ] = "Page Format..." ; }; //------------------------------ @@ -520,7 +520,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = FID_NOTE_VISIBLE ; - HelpId = FID_NOTE_VISIBLE ; + HelpId = CMD_FID_NOTE_VISIBLE ; Text [ en-US ] = "Sho~w Comment" ; }; }; diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 2f5a2d8c88fb..129ed62a6c15 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -72,7 +72,8 @@ */ // Hack: -#define U2S(x) ((x)-HID_START) +//#define U2S(x) ((x)-HID_START) +#define U2S(x) x // Macro U2S: unsigned to signed // is needed because the resource compiler only knows signed short int in // ExtraData, but the HID_XXX are unsigned and exceed 32k. Code reading the diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src index 6a8a3d955644..d93bc714ae9b 100644 --- a/sc/source/ui/src/solvrdlg.src +++ b/sc/source/ui/src/solvrdlg.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_SOLVER { OutputSize = TRUE ; - HelpId = SID_OPENDLG_SOLVE ; + HelpId = CMD_SID_OPENDLG_SOLVE ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 64 ) ; diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src index 25af654f4147..1145474255ba 100644 --- a/sc/source/ui/src/tabopdlg.src +++ b/sc/source/ui/src/tabopdlg.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_TABOP { OutputSize = TRUE ; - HelpId = SID_OPENDLG_TABOP ; + HelpId = CMD_SID_OPENDLG_TABOP ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 240 , 64 ) ; diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src index 6e4b89e5faa0..83ab7338970d 100644 --- a/sc/source/ui/src/toolbox.src +++ b/sc/source/ui/src/toolbox.src @@ -123,136 +123,6 @@ String SCSTR_QHELP_BTNEQUAL Text [ en-US ] = "Function" ; }; - // -------------------------------------------------------------------- - // PopUp's fuer Werkzeugleiste - // -------------------------------------------------------------------- - -FloatingWindow RID_TBXCTL_INSERT -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = RID_TBXCTL_INSERT ; - /* ### ACHTUNG: Neuer Text in Resource? Einfgen : Einfgen */ - Text [ en-US ] = "Insert" ; - - ToolBox RID_TOOLBOX_INSERT - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = RID_TOOLBOX_INSERT ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_INSERT_GRAPHIC ; - HelpID = SID_INSERT_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = SID_CHARMAP ; - HelpId = SID_CHARMAP ; - }; - }; - }; -}; - -FloatingWindow RID_TBXCTL_INSCELLS -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = RID_TBXCTL_INSCELLS ; - /* ### ACHTUNG: Neuer Text in Resource? Zellen einfgen : Zellen einfgen */ - Text [ en-US ] = "Insert Cells" ; - - ToolBox RID_TOOLBOX_INSCELLS - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = RID_TOOLBOX_INSCELLS ; - ItemList = - { - ToolBoxItem - { - Identifier = FID_INS_CELLSDOWN ; - HelpId = FID_INS_CELLSDOWN ; - }; - ToolBoxItem - { - Identifier = FID_INS_CELLSRIGHT ; - HelpId = FID_INS_CELLSRIGHT ; - }; - ToolBoxItem - { - Identifier = FID_INS_ROW ; - HelpId = FID_INS_ROW ; - }; - ToolBoxItem - { - Identifier = FID_INS_COLUMN ; - HelpId = FID_INS_COLUMN ; - }; - }; - }; -}; - -FloatingWindow RID_TBXCTL_INSOBJ -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE; - HelpID = RID_TBXCTL_INSOBJ ; - /* ### ACHTUNG: Neuer Text in Resource? Objekt einfgen : Objekt einfgen */ - Text [ en-US ] = "Insert Object" ; - ToolBox RID_TOOLBOX_INSOBJ - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = RID_TOOLBOX_INSOBJ ; - ItemList = - { - ToolBoxItem - { - // mit Aufziehen des Zielbereichs - ITEM_TOOLBAR_DRAW_CHART - }; - ToolBoxItem - { - Identifier = SID_INSERT_SMATH ; - HelpId = SID_INSERT_SMATH ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_FLOATINGFRAME ; - HelpID = SID_INSERT_FLOATINGFRAME ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_OBJECT ; - HelpId = SID_INSERT_OBJECT ; - }; -#ifdef SOLAR_PLUGIN - ToolBoxItem - { - Identifier = SID_INSERT_PLUGIN ; - HelpId = SID_INSERT_PLUGIN ; - }; -#endif -#ifdef SOLAR_JAVA - ToolBoxItem - { - Identifier = SID_INSERT_APPLET ; - HelpId = SID_INSERT_APPLET ; - }; -#endif - }; - }; -}; - // Don't use this image list for normal toolbar images. We have now our commandimagelist // folder in default_images. This list is now only used for special toolboxes that are // used in floating windows. diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 43eb2879236f..87740a88e4df 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -425,10 +425,8 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic EnableChildTransparentMode(); SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS ); - // FIXME: HELPID - SetHelpId( ""/*HID_SC_WIN_GRIDWIN*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_SC_WIN_GRIDWIN*/ ); + SetHelpId( HID_SC_WIN_GRIDWIN ); + SetUniqueId( HID_SC_WIN_GRIDWIN ); SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() ); EnableRTL( FALSE ); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 27c82967b9e6..83fdab9000e6 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -135,10 +135,8 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# SetBackground(); - // FIXME: HELPID - SetHelpId( ""/*HID_SC_WIN_PREVIEW*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_SC_WIN_PREVIEW*/ ); + SetHelpId( HID_SC_WIN_PREVIEW ); + SetUniqueId( HID_SC_WIN_PREVIEW ); SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() ); } diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 29cdac803d5c..ea06c1fe6c0c 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -44,7 +44,7 @@ #include <svl/ptitem.hxx> #include <svl/stritem.hxx> #include <tools/urlobj.hxx> - +#include <sfx2/objface.hxx> #include <vcl/msgbox.hxx> #include <vcl/vclenum.hxx> @@ -818,7 +818,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg->SetDescription( String( ScResId( STR_DLG_SELECTTABLES_TITLE ) ), String( ScResId( STR_DLG_SELECTTABLES_LBNAME ) ), - SID_SELECT_TABLES, HID_SELECTTABLES ); + GetStaticInterface()->GetSlot(SID_SELECT_TABLES)->GetCommand(), HID_SELECTTABLES ); // fill all table names with selection state String aTabName; @@ -1015,10 +1015,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_DOC*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_DOC*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_DOC ); if (pDlg->Execute() == RET_OK) aPassword = pDlg->GetPassword(); @@ -1040,10 +1038,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_PROTECTDOC) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_DOC*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_DOC*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_DOC ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if (pDlg->Execute() == RET_OK) @@ -1093,7 +1089,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) auto_ptr<SfxPasswordDialog> pDlg(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_TABLE ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); pDlg->SetEditHelpId( HID_PASSWD_TABLE ); if (pDlg->Execute() == RET_OK) @@ -1165,10 +1161,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_TABLE*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_TABLE*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_TABLE ); if (pDlg->Execute() == RET_OK) aPassword = pDlg->GetPassword(); @@ -1189,10 +1183,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_PROTECTTAB) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_TABLE*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_TABLE*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_TABLE ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if (pDlg->Execute() == RET_OK) diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 68a852c4a3b7..144e90367252 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -40,7 +40,7 @@ #include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <vcl/msgbox.hxx> - +#include <sfx2/objface.hxx> #include "tabvwsh.hxx" #include "sc.hrc" #include "docsh.hxx" @@ -411,26 +411,23 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); String aName; String aDlgTitle; + const sal_Char* pHelpId = 0; switch ( nSlot ) { case FID_TAB_APPEND: aDlgTitle = String(ScResId(SCSTR_APDTABLE)); pDoc->CreateValidTabName( aName ); + pHelpId = HID_SC_APPEND_NAME; break; case FID_TAB_RENAME: aDlgTitle = String(ScResId(SCSTR_RENAMETAB)); pDoc->GetName( pViewData->GetTabNo(), aName ); + pHelpId = HID_SC_RENAME_NAME; break; } -//CHINA001 ScStringInputDlg* pDlg = -//CHINA001 new ScStringInputDlg( GetDialogParent(), -//CHINA001 aDlgTitle, -//CHINA001 String(ScResId(SCSTR_NAME)), -//CHINA001 aName, -//CHINA001 nSlot ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001 @@ -438,7 +435,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) aDlgTitle, String(ScResId(SCSTR_NAME)), aName, - nSlot,RID_SCDLG_STRINPUT); + GetStaticInterface()->GetSlot(nSlot)->GetCommand(), pHelpId, RID_SCDLG_STRINPUT); DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001 while ( !bDone && nRet == RET_OK ) |