Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src

1 files changed, 11 insertions, 375 deletions

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index a0c48a7f5a0a..edf2eaeffec6 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -35,6 +35,11 @@
 #include <svx/dialogs.hrc>  // ->Svx-IDs
 #endif
 
+#include "sfx2/sfxcommands.h"
+#include "svx/svxcommands.h"
+#include "sccommands.h"
+#include "helpids.h"
+
 #define VAR_ARGS                30 // variable Parameter in scfuncs.src
 
 #define RID_HANDLEBITMAP        10005
@@ -58,26 +63,8 @@
 //  calc has a range of 2000 IDs
 //  the functions need 11*90 = 990 IDs
 
-#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_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 )
 
 // help IDs for templates
 #define HID_SC_SHEET_CELL_STD   (HID_SC_SHEET_START +0 )
@@ -106,360 +93,6 @@
 #define HID_SCSHELL_PAGEBREAK   (HID_SC_SHELL_START +14)
 #define HID_SCSHELL_MEDIA       (HID_SC_SHELL_START +15)
 
-// help IDs for document window
-#define HID_SC_WIN_GRIDWIN      ( HID_SC_WIN_START )
-#define HID_SC_WIN_PREVIEW      ( HID_SC_WIN_START + 1 )
-
-// help IDs for single controls (max.30)
-//  header/footer edit window: header/footer left/right left/middle/right
-#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_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 )
-
-//   partial results
-#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_NAVIPI_TOOLBOX   ( HID_SC_CONTROL_START + 29 )
-//  range is full!
-
-// help IDs for dialogs / 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 )
-
-//  function autopilots: only as 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_ADD_AUTOFMT      (HID_SC_DLG_START +52 )
-#define HID_SC_AUTOFMT_NAME     (HID_SC_DLG_START +53 )
-
-#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_FAP_STRUCT       (HID_SC_DLG_START +57 )
-#define HID_SC_ASCII_TABCTR     (HID_SC_DLG_START +58 )
-
-#define HID_SC_SCENARIO_DELETE  (HID_SC_DLG_START +59 )
-#define HID_SC_SCENARIO_EDIT    (HID_SC_DLG_START +60 )
-
-#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_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 )
-
-// header/footerDlg: context menu for filename
-#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 )
-
-
-// help IDs for object- and toolbars (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 )
-
-//  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_TOOLBOX_GRAPHIC  ( HID_SC_TOOLBOX_START + 7 )
-
-#define HID_CHG_PROTECT         ( HID_SC_TOOLBOX_START + 8 )
-
-#define HID_SC_RENAME_OBJECT    ( HID_SC_TOOLBOX_START + 9 )
-
-#define HID_SC_REN_AFMT_DLG     ( HID_SC_TOOLBOX_START + 10 )
-
-// help IDs for 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 )
-
-// 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_SELECTTABLES        ( HID_SC_OTHER_START + 2 )
-#define HID_SC_REPLCELLSWARN    ( HID_SC_OTHER_START + 3 )
-
-// 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 )
-
-// #i68101#
-#define HID_SC_TITLE_DESCRIPTION_OBJECT ( HID_SC_OTHER_START + 17 )
-
-#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_SCDLG_CONFLICTS     ( HID_SC_OTHER_START + 25 )
-
-#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 )
-
-// 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 )
-
-// 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 )
-
-// end help IDs
-
 
 // view-functions (max. 100)
 
@@ -1246,7 +879,6 @@
 #define STR_REPLCELLSWARN           (STR_START + 91)
 
 #define SCSTR_DPFUNCLISTBOX         (STR_START + 92)
-#define STR_PRINT_NOTHING           (STR_START + 93)
 #define SCSTR_ALLFILTER             (STR_START + 94)
 #define SCSTR_MOREBTN_MOREOPTIONS   (STR_START + 95)
 #define SCSTR_MOREBTN_FEWEROPTIONS  (STR_START + 96)
@@ -1314,6 +946,12 @@
 #define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
 #define STR_ACC_DATAPILOT_PAGE_DESCR (STR_START + 182)
 
+// IAccessibility2 Implementation 2009
+#define STR_ACC_TOOLBAR_FORMULA     (STR_START + 184)
+#define STR_ACC_DOC_SPREADSHEET     (STR_START + 185)
+#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
+#define STR_ACC_DOC_SPREADSHEET_READONLY        (STR_START + 187)
+
 #define SCSTR_HUMAN_SCDOC_NAME          (STR_START + 210)
 #define SCSTR_SHORT_SCDOC_NAME          (STR_START + 211)
 #define SCSTR_LONG_SCDOC_NAME           (STR_START + 212)
@@ -1600,7 +1238,6 @@
 
 // formula options page
 #define RID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 2)
-#define HID_SCPAGE_FORMULA          (SC_OOO_BUILD_START + 3)
 
 // insert current date and time to cell via command
 #define SID_INSERT_CURRENT_DATE     (SC_OOO_BUILD_START + 4)
@@ -1613,7 +1250,6 @@
 
 // compatibility options page
 #define RID_SCPAGE_COMPATIBILITY    (SC_OOO_BUILD_START + 9)
-#define HID_SCPAGE_COMPATIBILITY    (SC_OOO_BUILD_START + 10)
 
 #endif