From 5fcecf9b88a0879081d8239cebbc03e30150985a Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Thu, 21 Jun 2012 11:51:04 +0200 Subject: hrc cleanup: Remove unused defines All of those defines (should) not be used at any point in the code. False positives may exist, because some macro names are getting generated by some template/macro foo. This is the version which compiled fine for me. Also there are many commented out lines removed. Change-Id: I6394024682e4ab3691eb72707a9363d41ba31df8 --- basctl/inc/helpid.hrc | 5 - chart2/source/controller/dialogs/TabPages.hrc | 8 - .../source/controller/dialogs/dlg_DataEditor.hrc | 2 - .../controller/dialogs/tp_3D_SceneAppearance.hrc | 1 - chart2/source/controller/inc/HelpIds.hrc | 1 - cui/source/customize/acccfg.hrc | 5 - cui/source/customize/eventdlg.hrc | 4 - cui/source/dialogs/charmap.hrc | 1 - cui/source/dialogs/fmsearch.hrc | 1 - cui/source/dialogs/hangulhanjadlg.hrc | 2 - cui/source/dialogs/hyperdlg.hrc | 3 - cui/source/dialogs/passwdomdlg.hrc | 4 - cui/source/dialogs/scriptdlg.hrc | 2 - cui/source/dialogs/svuidlg.hrc | 1 - cui/source/inc/helpid.hrc | 5 - cui/source/options/optaccessibility.hrc | 1 - cui/source/options/optdict.hrc | 3 - cui/source/options/optgdlg.hrc | 5 - cui/source/options/optinet2.hrc | 16 - cui/source/options/optlingu.hrc | 4 - cui/source/options/optsave.hrc | 3 - cui/source/options/treeopt.hrc | 15 - cui/source/tabpages/autocdlg.hrc | 21 -- cui/source/tabpages/backgrnd.hrc | 5 - cui/source/tabpages/border.hrc | 3 - cui/source/tabpages/chardlg.hrc | 2 - cui/source/tabpages/labdlg.hrc | 7 - cui/source/tabpages/numfmt.hrc | 5 - cui/source/tabpages/numpages.hrc | 28 -- cui/source/tabpages/paragrph.hrc | 1 - cui/source/tabpages/tabarea.hrc | 35 +-- cui/source/tabpages/tabline.hrc | 5 - cui/source/tabpages/transfrm.hrc | 2 - dbaccess/inc/dbaccess_helpid.hrc | 2 - dbaccess/source/ui/app/dbu_app.hrc | 1 - dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 7 - dbaccess/source/ui/dlg/ConnectionPage.hrc | 6 - dbaccess/source/ui/dlg/dbadmin.hrc | 9 - dbaccess/source/ui/dlg/dbadminsetup.hrc | 11 - dbaccess/source/ui/dlg/paramdialog.hrc | 3 - dbaccess/source/ui/dlg/queryfilter.hrc | 1 - dbaccess/source/ui/inc/dbu_dlg.hrc | 2 - dbaccess/source/ui/inc/dbu_qry.hrc | 2 - dbaccess/source/ui/inc/dbu_resource.hrc | 24 -- dbaccess/source/ui/inc/sbagrid.hrc | 30 -- dbaccess/source/ui/querydesign/querydlg.hrc | 1 - desktop/source/app/desktop.hrc | 1 - desktop/source/deployment/gui/dp_gui.hrc | 1 - desktop/source/inc/helpid.hrc | 1 - editeng/inc/editeng/editids.hrc | 4 - editeng/inc/editeng/memberids.hrc | 11 +- extensions/inc/bibliography.hrc | 1 - extensions/inc/dbpilots.hrc | 4 - extensions/inc/extensio.hrc | 26 -- extensions/source/bibliography/sections.hrc | 20 -- extensions/source/bibliography/toolbar.hrc | 9 - extensions/source/scanner/sanedlg.hrc | 2 - filter/inc/filter.hrc | 3 - filter/source/graphicfilter/icgm/cgmres.hrc | 1 - filter/source/pdf/impdialog.hrc | 12 - framework/inc/framework.hrc | 4 - reportdesign/inc/rptui_slotid.hrc | 1 - reportdesign/source/ui/dlg/CondFormat.hrc | 3 - sc/inc/globstr.hrc | 2 - sc/inc/sc.hrc | 97 +----- sc/inc/scfuncs.hrc | 1 - sc/source/ui/dbgui/pivot.hrc | 5 - sc/source/ui/inc/datafdlg.hrc | 2 - sc/source/ui/inc/miscdlgs.hrc | 2 - sc/source/ui/inc/optdlg.hrc | 14 - sc/source/ui/inc/submenu.hrc | 35 --- sc/source/ui/pagedlg/pagedlg.hrc | 2 - sd/inc/app.hrc | 38 +-- sd/inc/glob.hrc | 6 - sd/inc/sdattr.hrc | 67 +--- sd/inc/sduiks.hrc | 24 -- sd/source/ui/animations/CustomAnimation.hrc | 1 - sd/source/ui/animations/CustomAnimationDialog.hrc | 3 - sd/source/ui/annotations/annotations.hrc | 4 - sd/source/ui/inc/fontwork.hrc | 13 - sd/source/ui/inc/optdlg.hrc | 2 - sd/source/ui/inc/packgdlg.hrc | 15 - sd/source/ui/inc/preview.hrc | 1 - sd/source/ui/inc/prntopts.hrc | 2 - sd/source/ui/inc/res_bmp.hrc | 5 - sd/source/ui/inc/strings.hrc | 87 ------ sd/source/ui/inc/tpaction.hrc | 6 - sd/source/ui/inc/tpoption.hrc | 6 - sd/source/ui/slideshow/slideshow.hrc | 2 - sfx2/inc/sfx2/cntids.hrc | 343 --------------------- sfx2/inc/sfx2/sfx.hrc | 75 +---- sfx2/inc/sfx2/sfxsids.hrc | 272 +--------------- sfx2/source/appl/app.hrc | 2 - sfx2/source/bastyp/bastyp.hrc | 2 - sfx2/source/dialog/dinfdlg.hrc | 7 - sfx2/source/dialog/passwd.hrc | 1 - sfx2/source/dialog/templdlg.hrc | 4 - sfx2/source/dialog/versdlg.hrc | 1 - sfx2/source/doc/doc.hrc | 12 - sfx2/source/doc/doctdlg.hrc | 1 - sfx2/source/doc/docvor.hrc | 3 - sfx2/source/doc/new.hrc | 3 - sfx2/source/inc/helpid.hrc | 149 --------- sfx2/source/inc/sfxlocal.hrc | 2 - sfx2/source/menu/menu.hrc | 12 - sfx2/source/view/view.hrc | 22 +- starmath/inc/starmath.hrc | 3 - svl/inc/svl/cntwids.hrc | 255 --------------- svl/inc/svl/memberid.hrc | 2 - svl/inc/svl/solar.hrc | 149 ++------- svl/inc/svl/svl.hrc | 4 - svtools/inc/svtools/controldims.hrc | 3 - svtools/inc/svtools/helpid.hrc | 11 - svtools/inc/svtools/imagemgr.hrc | 2 - svtools/inc/svtools/svtools.hrc | 53 ---- svtools/source/contnr/templwin.hrc | 1 - svx/inc/fmhelp.hrc | 1 - svx/inc/gallery.hrc | 46 --- svx/inc/helpid.hrc | 53 ---- svx/inc/svx/dialogs.hrc | 1 - svx/inc/svx/fmresids.hrc | 1 - svx/inc/svx/svxids.hrc | 297 ------------------ svx/source/dialog/bmpmask.hrc | 2 - svx/source/dialog/ctredlin.hrc | 1 - svx/source/dialog/docrecovery.hrc | 7 - svx/source/dialog/imapdlg.hrc | 3 - svx/source/dialog/optgrid.hrc | 7 - svx/source/dialog/srchdlg.hrc | 5 +- svx/source/src/app.hrc | 3 - svx/source/tbxctrls/lboxctrl.hrc | 1 - sw/inc/access.hrc | 3 - sw/inc/chrdlg.hrc | 2 - sw/inc/dialog.hrc | 11 +- sw/inc/envelp.hrc | 4 +- sw/inc/fldui.hrc | 10 - sw/inc/fmtui.hrc | 28 -- sw/inc/globals.hrc | 62 ---- sw/inc/poolfmt.hrc | 8 - sw/inc/rcid.hrc | 58 ++-- sw/source/core/undo/undo.hrc | 5 - sw/source/ui/chrdlg/chardlg.hrc | 39 --- sw/source/ui/chrdlg/paradlg.hrc | 37 --- sw/source/ui/config/config.hrc | 19 -- sw/source/ui/config/optdlg.hrc | 27 -- sw/source/ui/dbui/mmoutputpage.hrc | 1 - sw/source/ui/dialog/regionsw.hrc | 4 - sw/source/ui/dialog/wordcountdialog.hrc | 1 - sw/source/ui/envelp/label.hrc | 2 - sw/source/ui/fldui/changedb.hrc | 1 - sw/source/ui/frmdlg/column.hrc | 3 - sw/source/ui/frmdlg/cption.hrc | 3 - sw/source/ui/frmdlg/frmpage.hrc | 2 - sw/source/ui/frmdlg/pattern.hrc | 12 - sw/source/ui/inc/app.hrc | 22 -- sw/source/ui/inc/frmui.hrc | 58 ---- sw/source/ui/inc/globdoc.hrc | 14 - sw/source/ui/inc/misc.hrc | 17 - sw/source/ui/inc/popup.hrc | 4 - sw/source/ui/inc/ribbar.hrc | 17 - sw/source/ui/inc/utlui.hrc | 1 - sw/source/ui/inc/web.hrc | 23 +- sw/source/ui/index/cnttab.hrc | 47 --- sw/source/ui/lingu/olmenu.hrc | 1 - sw/source/ui/misc/glossary.hrc | 2 - sw/source/ui/misc/outline.hrc | 18 -- sw/source/ui/misc/pggrid.hrc | 2 - sw/source/ui/ribbar/tblctrl.cxx | 2 - sw/source/ui/ribbar/tblctrl.hrc | 35 --- sw/source/ui/ribbar/workctrl.hrc | 3 - sw/source/ui/smartmenu/stmenu.hrc | 1 - sw/source/ui/table/tabledlg.hrc | 7 - sw/source/ui/uiview/pview.hrc | 7 - sw/source/ui/utlui/navipi.hrc | 10 - sw/source/ui/wrtsh/wrtsh.hrc | 1 - toolkit/src2xml/src-sw.lst | 1 - toolkit/src2xml/src.lst | 1 - uui/source/ids.hrc | 8 - vcl/inc/svids.hrc | 13 - vcl/inc/vcl/fpicker.hrc | 1 - xmlsecurity/source/dialogs/dialogs.hrc | 9 - 180 files changed, 80 insertions(+), 3260 deletions(-) delete mode 100644 sw/source/ui/ribbar/tblctrl.hrc diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc index c747d1446403..595cc4995f02 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/inc/helpid.hrc @@ -20,11 +20,6 @@ #define HID_BASICIDE_TOOLBOX "BASCTL_HID_BASICIDE_TOOLBOX" #define HID_BASICIDE_OBJECTS "BASCTL_HID_BASICIDE_OBJECTS" -#define HID_MACRO_OPTIONS "BASCTL_HID_MACRO_OPTIONS" -#define HID_BASICIDE_BRKPNTS "BASCTL_HID_BASICIDE_BRKPNTS" -#define HID_BASICIDE_MODULS "BASCTL_HID_BASICIDE_MODULS" -#define HID_BASICIDE_LIBS_TP "BASCTL_HID_BASICIDE_LIBS_TP" -#define HID_BASICIDE_LIBS_DLG "BASCTL_HID_BASICIDE_LIBS_DLG" #define HID_BASICIDE_CONTROLS "BASCTL_HID_BASICIDE_CONTROLS" #define HID_BASICIDE_MACROS "BASCTL_HID_BASICIDE_MACROS" #define HID_BASICIDE_LIBS "BASCTL_HID_BASICIDE_LIBS" diff --git a/chart2/source/controller/dialogs/TabPages.hrc b/chart2/source/controller/dialogs/TabPages.hrc index 30f292a6f5fb..b8aef9fd4a9f 100644 --- a/chart2/source/controller/dialogs/TabPages.hrc +++ b/chart2/source/controller/dialogs/TabPages.hrc @@ -38,18 +38,12 @@ #define FT_LEGEND_TEXTDIR 3 #define LB_LEGEND_TEXTDIR 4 -#define FL_TEXTBREAK 3 -#define CBX_TEXTBREAK 2 -#define CBX_TEXTOVERLAP 4 - //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES // ID's for title rotation tabpage #define CTR_DIAL 6030 #define BTN_TXTSTACKED 6031 #define FT_DEGREES 6032 #define NF_ORIENT 6033 -#define CTR_DUMMY 6034 -#define FT_DUMMY 6035 #define FL_ALIGN 6037 #define FT_TEXTDIR 6038 #define LB_TEXTDIR 6039 @@ -80,8 +74,6 @@ #define FT_AXIS_TEXTDIR 19 #define LB_AXIS_TEXTDIR 20 -//#define TP_AXIS_POSITIONS 904 - #define FL_AXIS_LINE 1 #define FL_LABELS 2 #define FL_TICKS 3 diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.hrc b/chart2/source/controller/dialogs/dlg_DataEditor.hrc index 5d3ea8667e68..0190611ad97c 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.hrc +++ b/chart2/source/controller/dialogs/dlg_DataEditor.hrc @@ -27,8 +27,6 @@ #define DLG_DIAGRAM_DATA 744 #define FT_POS 1 -#define TBX_EDIT 1 -#define EDT_FIELD 1 #define TBX_DATA 2 #define CTL_DATA 1 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc index e01be1c35072..c5e006feec5b 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc @@ -34,5 +34,4 @@ #define FL_SEPERATOR 1 -#define LB_SHADING 1 #define LB_SCHEME 2 diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 5e20b7980c8b..d50b5bd3dedd 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -31,7 +31,6 @@ #define HID_SCH_LEGEND_POS "CHART2_HID_SCH_LEGEND_POS" #define HID_SCH_DATA_DESCR "CHART2_HID_SCH_DATA_DESCR" -#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" diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc index eaa39b11e97b..b1e682ed1cea 100644 --- a/cui/source/customize/acccfg.hrc +++ b/cui/source/customize/acccfg.hrc @@ -26,13 +26,9 @@ ************************************************************************/ #define GRP_FUNCTIONS 22 -#define BTN_ACC_OK 1 -#define BTN_ACC_CANCEL 2 #define BTN_ACC_CHANGE 3 #define BTN_ACC_REMOVE 4 #define BOX_ACC_ENTRIES 5 -#define TXT_ACC_DESCRIPTIONTEXT 6 -#define TXT_ACC_DESCRIPTIONINFO 7 #define GRP_ACC_KEYBOARD 8 #define TXT_ACC_GROUP 9 #define BOX_ACC_GROUP 10 @@ -57,7 +53,6 @@ #define IMG_DOC 56 #define STR_GROUP_STYLES 58 #define STR_PDF_EXPORT_SEND 59 -#define STR_RECHECK_DOCUMENT 60 #define IMG_INFO 61 // FREE #define BMP_COLLAPSED 63 diff --git a/cui/source/customize/eventdlg.hrc b/cui/source/customize/eventdlg.hrc index 8e482d83b97f..f0b2036a427a 100644 --- a/cui/source/customize/eventdlg.hrc +++ b/cui/source/customize/eventdlg.hrc @@ -35,9 +35,5 @@ #define TXT_SAVEIN 10 #define LB_SAVEIN 11 -#define MB_CONFIG 17 -#define CB_WARNING 18 -#define CB_WARNING_ALWAYS 19 -#define GB_SAFETY 20 #define ID_APP 21 #define ID_DOC 22 diff --git a/cui/source/dialogs/charmap.hrc b/cui/source/dialogs/charmap.hrc index 0b3aa3e09b49..30ad06bd6813 100644 --- a/cui/source/dialogs/charmap.hrc +++ b/cui/source/dialogs/charmap.hrc @@ -45,7 +45,6 @@ #define ED_SHORTCUT 32 #define BT_ASSIGN 33 #define FT_ASSIGN 34 -#define CT_ASSIGN 35 #endif diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc index cfad011101c2..f76d1ef2875b 100644 --- a/cui/source/dialogs/fmsearch.hrc +++ b/cui/source/dialogs/fmsearch.hrc @@ -44,7 +44,6 @@ #define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35) #define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76) -#define FT_SEARCHTEXT 1 #define FT_FORM 2 #define FT_POSITION 3 #define FT_RECORDLABEL 4 diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc index 817e3a17264a..e5389c82c6a1 100644 --- a/cui/source/dialogs/hangulhanjadlg.hrc +++ b/cui/source/dialogs/hangulhanjadlg.hrc @@ -124,7 +124,6 @@ #define HHO_ROW_a3 (HHO_ROW_a2+2) #define HHO_ROW_a4 (HHO_ROW_a3+14) #define HHO_ROW_a5 (HHO_ROW_a4+4) -#define HHO_ROW_a6 (HHO_ROW_a5+14) // Hangul / Hanja New Dictonary Dialog @@ -185,7 +184,6 @@ #define HHE_ROW_6 (HHE_ROW_5+12) #define HHE_ROW_7 (HHE_ROW_6+2) #define HHE_ROW_8 (HHE_ROW_7+2) -#define HHE_ROW_9 (HHE_ROW_6+12) #define HHE_ROW_10 (HHE_ROW_8+RSC_SP_CTRL_GROUP_Y) #define HHE_ROW_11 (HHE_ROW_10+8+2) #define HHE_ROW_12 (HHE_ROW_11+4*12) diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc index ead6a8239059..3eec5a60ea8f 100644 --- a/cui/source/dialogs/hyperdlg.hrc +++ b/cui/source/dialogs/hyperdlg.hrc @@ -31,7 +31,6 @@ #define RB_LINKTYP_INTERNET 2 #define RB_LINKTYP_FTP 3 #define FT_TARGET_HTML 5 -#define CB_TARGET_HTML 6 #define FT_LOGIN 7 #define ED_LOGIN 8 #define FT_PASSWD 9 @@ -46,7 +45,6 @@ #define RB_LINKTYP_MAIL 2 #define RB_LINKTYP_NEWS 3 #define FT_RECEIVER 4 -#define CB_RECEIVER 5 #define FT_SUBJECT 6 #define ED_SUBJECT 7 #define BTN_ADRESSBOOK 8 @@ -55,7 +53,6 @@ #define GRP_DOCUMENT 1 #define FT_PATH_DOC 2 -#define CB_PATH_DOC 3 #define BTN_FILEOPEN 4 #define GRP_TARGET 5 #define FT_TARGET_DOC 6 diff --git a/cui/source/dialogs/passwdomdlg.hrc b/cui/source/dialogs/passwdomdlg.hrc index edeae469a3c5..b31c18d5abf6 100644 --- a/cui/source/dialogs/passwdomdlg.hrc +++ b/cui/source/dialogs/passwdomdlg.hrc @@ -33,8 +33,6 @@ #define ED_PASSWD_TO_OPEN 12 #define FT_REENTER_PASSWD_TO_OPEN 13 #define ED_REENTER_PASSWD_TO_OPEN 14 -#define IMG_PASSWD_MATCH 15 -#define IMG_PASSWD_MATCH_HC 16 #define FT_PASSWD_NOTE 17 #define FL_BUTTONS 18 #define BTN_MORE_FEWER_OPTIONS 19 @@ -45,8 +43,6 @@ #define ED_PASSWD_TO_MODIFY 24 #define FT_REENTER_PASSWD_TO_MODIFY 25 #define ED_REENTER_PASSWD_TO_MODIFY 26 -#define FI_PASSWD_TO_OPEN_MATCH 27 -#define FI_PASSWD_TO_MODIFY_MATCH 28 #define CB_OPEN_READONLY 29 #define STR_MORE_OPTIONS 51 diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc index 7ea7184da5fa..1c8e0bceda5b 100644 --- a/cui/source/dialogs/scriptdlg.hrc +++ b/cui/source/dialogs/scriptdlg.hrc @@ -30,8 +30,6 @@ #include -#define SCRIPTDLG_OFFSET 400 - // ScriptOrgDialog #define SF_TXT_SCRIPTS 1 #define SF_CTRL_SCRIPTSBOX 2 diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc index 8add126a33c7..cf6245ed49d0 100644 --- a/cui/source/dialogs/svuidlg.hrc +++ b/cui/source/dialogs/svuidlg.hrc @@ -32,7 +32,6 @@ // gemeinsame Id's #define CB_DISPLAY_AS_ICON 12 -#define FI_DISPLAY 13 #define PB_CHANGE_ICON 14 #define STR_AUTOLINK 32006 diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 65c71807bbee..2be79d87b439 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -38,10 +38,8 @@ #define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH" #define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL" #define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU" -#define HID_OPTIONS_SPELL "CUI_HID_OPTIONS_SPELL" #define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW" #define HID_OPTIONS_DICT_EDIT "CUI_HID_OPTIONS_DICT_EDIT" -#define HID_OPTIONS_INET "CUI_HID_OPTIONS_INET" #define HID_OPTIONS_CHART_DEFCOLORS "CUI_HID_OPTIONS_CHART_DEFCOLORS" #define HID_OPTIONS_CTL "CUI_HID_OPTIONS_CTL" #define HID_OPTIONS_PROXY "CUI_HID_OPTIONS_PROXY" @@ -86,7 +84,6 @@ #define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST" #define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR" #define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE" -#define HID_COLORPAGE_LISTBOX_START "CUI_HID_COLORPAGE_LISTBOX_START" #define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB" #define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB" #define HID_COLORPAGE_APPBACKGROUND_LB "CUI_HID_COLORPAGE_APPBACKGROUND_LB" @@ -133,7 +130,6 @@ #define HID_COLORPAGE_SQLKEYWORD_LB "CUI_HID_COLORPAGE_SQLKEYWORD_LB" #define HID_COLORPAGE_SQLPARAMETER_LB "CUI_HID_COLORPAGE_SQLPARAMETER_LB" #define HID_COLORPAGE_SQLCOMMENT_LB "CUI_HID_COLORPAGE_SQLCOMMENT_LB" -#define HID_COLORPAGE_CHECKBOX_START "CUI_HID_COLORPAGE_CHECKBOX_START" #define HID_COLORPAGE_DOCCOLOR_CB "CUI_HID_COLORPAGE_DOCCOLOR_CB" #define HID_COLORPAGE_DOCBOUNDARIES_CB "CUI_HID_COLORPAGE_DOCBOUNDARIES_CB" #define HID_COLORPAGE_APPBACKGROUND_CB "CUI_HID_COLORPAGE_APPBACKGROUND_CB" @@ -381,7 +377,6 @@ #define HID_PASTE_DLG "CUI_HID_PASTE_DLG" #define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB" #define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX" -#define HID_GALLERY_ENTER_TITLE "CUI_HID_GALLERY_ENTER_TITLE" #define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT" #define HID_THES_LANGUAGE "CUI_HID_THES_LANGUAGE" #define HID_OFAPAGE_QUOTE_SW_CLB "CUI_HID_OFAPAGE_QUOTE_SW_CLB" diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc index 6cc5e0a891d1..cd66c7a2164d 100644 --- a/cui/source/options/optaccessibility.hrc +++ b/cui/source/options/optaccessibility.hrc @@ -59,7 +59,6 @@ #define ROWB_3 ( ROWB_2 + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE ) #define WHOLE_HEIGHT 185 -#define LASTTEXT_HEIGHT (WHOLE_HEIGHT-ROWB_8) #define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) #define DIFF(v1,v2) (v2-v1) #define SUM(v1,v2) (v2+v1) diff --git a/cui/source/options/optdict.hrc b/cui/source/options/optdict.hrc index e7233f2b67ef..6cf3dff54252 100644 --- a/cui/source/options/optdict.hrc +++ b/cui/source/options/optdict.hrc @@ -54,9 +54,6 @@ #define STR_MODIFY 42 #define BTN_EDITCLOSE 50 -#define BTN_EDITNEW 51 -#define BTN_EDITCHANGE 52 -#define BTN_EDITREMOVE 53 #define BTN_EDITHELP 54 diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 2ccc5037045f..8ecdec8a5b2b 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -111,7 +111,6 @@ #define PB_HELPAGENT_RESET 14 #define FT_HELPFORMAT 15 #define LB_HELPFORMAT 16 -#define FT_EXPERIMENTAL 17 #define CB_EXPERIMENTAL 18 #define FT_MACRORECORDER 19 #define CB_MACRORECORDER 20 @@ -173,8 +172,6 @@ // tabpage languages ----------------------------------------------------- #define FL_UI_LANG 1 -#define FT_UI_LANG 2 -#define LB_UI_LANG 3 #define FL_LINGU_LANG 4 #define FT_WEST_LANG 5 #define LB_WEST_LANG 6 @@ -202,7 +199,6 @@ #define FI_USERINTERFACE 29 #define FT_USERINTERFACE 30 #define LB_USERINTERFACE 31 -#define STR_IB_LANGCHANGE_TITLE 32 #define FL_FILEDLG 53 #define FI_FILEDLG_RO 54 @@ -210,7 +206,6 @@ #define FT_GRAPHICCACHE_UNIT 56 #define FT_GRAPHICOBJECTCACHE_UNIT 57 #define FT_GRAPHICOBJECTTIME_UNIT 58 -#define FT_HELPAGENT_TIME_UNIT 59 #define FL_DOCSTATUS 60 #define CB_DOCSTATUS 61 #define CB_ODMADLG 62 diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc index 64bf526beadb..8a3d21da0055 100644 --- a/cui/source/options/optinet2.hrc +++ b/cui/source/options/optinet2.hrc @@ -67,20 +67,6 @@ #define ST_MSG_255_0 111 #define ST_MSG_255_1 112 -// Site Certificate -------------------------------------------------------- -#define GB_SITECERT 120 -#define LB_SITECERT 121 -#define LB_FILTERCERT 122 -#define PB_EDIT_CERT 123 -#define PB_DELETE_CERT 124 - -// personal Certificate ---------------------------------------------------- -#define GB_PERSCERT 130 -#define LB_PERSCERT 131 -#define PB_NEW_PERSCERT 132 -#define PB_INFO_PERSCERT 133 -#define PB_DELETE_PERSCERT 134 - // Security ------------------------------------------------------------- #define FL_SEC_SECURITYOPTIONS 10 @@ -101,7 +87,6 @@ #define STR_SEC_NOPASSWDSAVE 12 -#define OFFS_BUTTON_Y (-6) #define BORDER_OFFSET 8 #define COL_0 (RSC_SP_TBPG_INNERBORDER_LEFT) #define COL_1 (COL_0+RSC_SP_FLGR_SPACE_X) @@ -130,7 +115,6 @@ #define IMG_JSCPT_WARNING 220 #define FT_JSCPT_WARNING 221 #define CB_JSCPT_DISABLE 222 -#define GB_JSCPT_WARNING 223 #define BTN_JSCPT_YES 224 #define BTN_JSCPT_NO 225 diff --git a/cui/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc index 824e2236e9c6..7cf44b4037ec 100644 --- a/cui/source/options/optlingu.hrc +++ b/cui/source/options/optlingu.hrc @@ -25,8 +25,6 @@ * ************************************************************************/ -// defines --------------------------------------------------------------- - #define FL_LINGUISTIC 101 #define FT_LINGU_MODULES 111 @@ -55,8 +53,6 @@ #define STR_GRAMMAR_AUTO 217 -#define STR_WARNING 63 - #define PB_OK 70 #define PB_HELP 72 diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc index f0fcbe982822..64882a194b2d 100644 --- a/cui/source/options/optsave.hrc +++ b/cui/source/options/optsave.hrc @@ -38,14 +38,12 @@ #define BTN_AUTOSAVE 16 #define ED_AUTOSAVE 17 #define FT_MINUTE 18 -#define BTN_AUTOSAVEPROMPT 19 #define BTN_NOPRETTYPRINTING 20 #define FI_BACKUP 21 #define BTN_WARNALIENFORMAT 22 #define FT_ODF_VERSION 23 #define LB_ODF_VERSION 24 -#define GB_RELATIVE 40 #define BTN_RELATIVE_FSYS 41 #define BTN_RELATIVE_INET 42 @@ -72,7 +70,6 @@ //Filter warning #define PB_OK 1 #define FT_FILTER_WARNING 2 -#define CB_DONT_SHOW_AGAIN 3 #define IMG_WARNING 4 #define PB_CANCEL 5 diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc index 3be1d6a8cdfa..35a916b18803 100644 --- a/cui/source/options/treeopt.hrc +++ b/cui/source/options/treeopt.hrc @@ -26,7 +26,6 @@ ************************************************************************/ #include - #include #define PB_OK 1 @@ -39,22 +38,8 @@ #define FT_HINT 21 #define CB_DISABLE 22 -#define BTN_HINT 23 #define ST_LOAD_ERROR 24 -#define STR_GENERAL_PAGES_START 1 -#define STR_GENERAL (STR_GENERAL_PAGES_START) -#define STR_MISC_PAGE (STR_GENERAL_PAGES_START + 1) -#define STR_DESKTOP_PAGE (STR_GENERAL_PAGES_START + 2) -#define STR_VIEW_PAGE (STR_GENERAL_PAGES_START + 3) -#define STR_FONT_PAGE (STR_GENERAL_PAGES_START + 4) -#define STR_PRINT_PAGE (STR_GENERAL_PAGES_START + 5) -#define STR_COLOR_PAGE (STR_GENERAL_PAGES_START + 6) -#define STR_LING_PAGE (STR_GENERAL_PAGES_START + 7) -#define STR_PATH_PAGE (STR_GENERAL_PAGES_START + 8) -#define STR_SAVE_PAGE (STR_GENERAL_PAGES_START + 9) -#define STR_USERDATA_PAGE (STR_GENERAL_PAGES_START + 10) - // metrics #define WIDTH_PAGEFRAME TP_WIDTH diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc index 61ea73eb03de..01a8cf6185c6 100644 --- a/cui/source/tabpages/autocdlg.hrc +++ b/cui/source/tabpages/autocdlg.hrc @@ -32,15 +32,6 @@ // defines ------------------------------------------------------------------ #define CLB_SETTINGS 1 -/* -#define STR_DOUBLECAPS 3 -#define STR_STARTCAPS 4 -#define STR_FIRST 5 -#define STR_HALF 6 -#define STR_DASH 7 -#define STR_BOLDUNDERLINE 8 -#define STR_URL 9 -*/ #define CB_TYPO 11 #define FT_STARTQUOTE 12 @@ -66,7 +57,6 @@ #define PB_NEW_REPLACE 35 #define PB_DELETE_REPLACE 36 #define STR_MODIFY 37 -#define STR_CLOSE_AUTOCORR 38 #define FT_SHORT 39 #define FT_REPLACE 40 #define STR_CHANGE_START 41 @@ -91,7 +81,6 @@ #define PB_EDIT 61 #define ST_DEL_EMPTY_PARA 62 -#define ST_TYPO 66 #define ST_USER_STYLE 67 #define ST_BULLET 68 #define STR_DEL_SPACES_AT_STT_END 69 @@ -105,7 +94,6 @@ #define FL_PRCNT 79 #define STR_HEADER 90 -#define FT_HEADER_EXPLANATION 91 #define STR_HEADER1 92 #define STR_HEADER2 93 #define FT_HEADER1_EXPLANATION 94 @@ -115,14 +103,6 @@ #define BT_OK 101 #define BT_CANCEL 102 -#define BT_AWCP_OK 110 -#define BT_AWCP_CANCEL 111 -#define GB_AWCP_VALUE 112 -#define ED_AWCP_WORD_LEN 113 -#define ED_AWCP_LIST_LEN 114 -#define FT_AWCP_WORD_LEN 115 -#define FT_AWCP_LIST_LEN 116 - #define CB_ACTIV 121 #define CB_COLLECT 122 #define CB_APPEND_SPACE 123 @@ -137,7 +117,6 @@ #define LB_ENTRIES 132 #define PB_ENTRIES 133 - #define ST_USE_REPLACE 200 #define ST_CPTL_STT_WORD 201 #define ST_CPTL_STT_SENT 202 diff --git a/cui/source/tabpages/backgrnd.hrc b/cui/source/tabpages/backgrnd.hrc index fdfafabe8f11..4961e18e9539 100644 --- a/cui/source/tabpages/backgrnd.hrc +++ b/cui/source/tabpages/backgrnd.hrc @@ -34,10 +34,6 @@ #define SET_BGDCOLOR 10 #define GB_BGDCOLOR 11 -#define SET_PATTERN 12 -#define GB_COL_PREVIEW 13 -#define SET_PATCOLOR 14 -#define GB_PATCOLOR 15 #define CT_BORDER 16 #define FT_PREVIEW 20 #define WIN_PREVIEW1 21 @@ -53,7 +49,6 @@ #define WND_POSITION 28 #define GB_POSITION 29 #define WIN_PREVIEW2 30 -#define GB_PREVIEW 31 #define LB_TBL_BOX 32 #define FT_TBL_DESC 33 #define LB_PARA_BOX 34 diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc index 6ae3ef00860a..360bd7a04883 100644 --- a/cui/source/tabpages/border.hrc +++ b/cui/source/tabpages/border.hrc @@ -48,9 +48,6 @@ #define FT_SHADOWCOLOR 35 #define LB_SHADOWCOLOR 36 -#define FT_XSPACE 41 -#define ED_XSPACE 42 - #define FL_DISTANCE 50 #define FT_LEFT 51 #define MF_LEFT 52 diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc index 0d583b0431e8..a41b0c4c4227 100644 --- a/cui/source/tabpages/chardlg.hrc +++ b/cui/source/tabpages/chardlg.hrc @@ -119,7 +119,6 @@ #define WIN_EFFECTS_PREVIEW 251 #define FT_EFFECTS_FONTTYPE 252 -#define STR_EFFECTS_TRANSPARENT 260 #define STR_EFFECTS_CAPITALS 261 #define STR_EFFECTS_LOWERCASE 262 #define STR_EFFECTS_TITLE 263 @@ -168,7 +167,6 @@ #define FT_ENDBRACKET 413 #define ED_ENDBRACKET 414 -#define FL_TWOLINES_PREVIEW 420 #define WIN_TWOLINES_PREVIEW 421 #define FT_TWOLINES_FONTTYPE 422 diff --git a/cui/source/tabpages/labdlg.hrc b/cui/source/tabpages/labdlg.hrc index 8759a0158f22..39f713cf49b5 100644 --- a/cui/source/tabpages/labdlg.hrc +++ b/cui/source/tabpages/labdlg.hrc @@ -25,8 +25,6 @@ * ************************************************************************/ #include -//#define RID_SVXPAGE_CAPTION 1000 -//#define RID_SVXDLG_CAPTION 1001 #define TAB_CONTROL 1 #define BTN_OK 1 @@ -48,8 +46,6 @@ #define CB_LAENGE 1 -#define CM_LAENGE 1 - #define LB_WINKEL 1 #define LB_ANSATZ 2 #define LB_ANSATZ_REL 3 @@ -66,7 +62,4 @@ #define BMP_CAPTTYPE_3 3 #define BMP_CAPTTYPE_4 4 -#define SHOW_HORZ 1 -#define SHOW_VERT 2 -#define SHOW_ABS 3 #define SHOW_NONE 4 diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc index 763dd59f752d..ead7ac05bbf1 100644 --- a/cui/source/tabpages/numfmt.hrc +++ b/cui/source/tabpages/numfmt.hrc @@ -44,10 +44,6 @@ #define ED_FORMAT 14 #define BTN_ADD 15 #define BTN_REMOVE 16 -#define BMP_CHECK 17 -#define BMP_DCHECK 18 -#define BMP_CROSS 19 -#define BMP_DCROSS 20 #define FT_DECIMALS 21 #define ED_DECIMALS 22 #define FT_LEADZEROES 23 @@ -64,7 +60,6 @@ #define CB_SOURCEFORMAT 34 #define STR_AUTO_ENTRY 36 -#define TBX_ADDREMOVE 1 #define IID_ADD 1 #define IID_REMOVE 2 #define IID_INFO 3 diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc index 02fb93676658..9991184a9c7a 100644 --- a/cui/source/tabpages/numpages.hrc +++ b/cui/source/tabpages/numpages.hrc @@ -27,41 +27,14 @@ #define FT_ALIGN 50 #define LB_ALIGN 51 -#define FT_DIST_BORDER 52 -#define MF_DIST_BORDER 53 -#define FT_DIST_NUM 54 -#define MF_DIST_NUM 55 -#define GB_POS 56 - -#define LB_FMT_CHAR 60 -#define FT_FMT_CHAR 61 #define FT_WIDTH 67 -#define FI_URL 68 #define FT_HEIGHT 70 - -#define MN_STD_NUMBER 120 -#define MD_DEL_NUMBER 121 -#define MN_STD_BULLET 122 -#define MN_DEL_BULLET 123 - #define STR_BULLET 200 -//#define STR_NUMFMT_1 201 -//#define STR_NUMFMT_2 202 -//#define STR_NUMFMT_3 203 -//#define STR_NUMFMT_4 204 -//#define STR_NUMFMT_5 205 -//#define STR_NUMFMT_6 206 -//#define STR_NUMFMT_7 207 -//#define STR_NUMFMT_8 208 -//#define STR_NUMFMT_7_HTML 209 #define LB_FORM 210 #define ED_FORM 211 -#define GB_FORM 212 - -#define BT_BULLET 213 #define FL_VALUES 220 #define VS_VALUES 221 @@ -90,7 +63,6 @@ #define NF_ALL_LEVEL 169 #define FT_START 170 #define ED_START 171 -#define FT_BULLET 172 #define PB_BULLET 173 #define WIN_PREVIEW 174 #define FT_BITMAP 175 diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc index bb9a3fc9cf18..c3ced580fbe2 100644 --- a/cui/source/tabpages/paragrph.hrc +++ b/cui/source/tabpages/paragrph.hrc @@ -51,7 +51,6 @@ #define FL_ALIGN 34 #define FL_VERTALIGN 35 #define LB_VERTALIGN 36 -#define FL_VERTEX 37 #define CB_SNAP 38 #define FT_VERTALIGN 39 diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc index 18f4c5680f26..3d6178561585 100644 --- a/cui/source/tabpages/tabarea.hrc +++ b/cui/source/tabpages/tabarea.hrc @@ -24,18 +24,12 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #define BTN_LOAD 5 #define BTN_SAVE 6 #define BTN_EMBED 7 -#define GRP_FILL 1 -#define GRP_SHADOW 2 -#define GRP_PREVIEW 3 -#define GRP_TRANSPARENT 4 -#define GRP_STEPCOUNT 5 #define CTL_PREVIEW 1 #define CTL_POSITION 2 -//#define CTL_GRADIENT_PREVIEW 3 -//#define CTL_HATCHING_PREVIEW 4 #define CTL_COLOR_PREVIEW 5 #define CTL_BITMAP_PREVIEW 6 #define MTR_FLD_DISTANCE 1 @@ -45,20 +39,13 @@ #define TSB_TILE 4 #define TSB_STRETCH 5 #define TSB_ORIGINAL 6 -#define AREADLG_INVISIBLE 0 -#define AREADLG_COLOR 1 -#define AREADLG_GRADIENT 2 -#define AREADLG_HATCH 3 -#define AREADLG_BITMAP 4 #define LB_COLOR 1 #define LB_GRADIENT 2 #define LB_HATCHING 3 #define LB_BITMAP 4 -//#define LB_TRANSPARENT 5 #define LB_BITMAPS 4 #define LB_BACKGROUND_COLOR 3 -#define LB_DLG_TYPE 99 #define GRP_COLOR 1 #define BTN_ADD 1 #define BTN_IMPORT 2 @@ -72,15 +59,11 @@ #define FT_LINE_TYPE 1 #define FT_LINE_DISTANCE 3 #define FT_LINE_ANGLE 4 -#define GRP_LINE 1 -#define GRP_HATCHINGS 5 #define MTR_FLD_ANGLE 3 #define CTL_ANGLE 2 #define LB_HATCHINGS 4 #define LB_LINE_TYPE 1 #define LB_LINE_COLOR 3 -#define GRP_GRADIENTS 4 -#define GRP_GRADIENT_TYPE 5 #define LB_GRADIENTS 3 #define LB_GRADIENT_TYPES 4 #define LB_COLOR_FROM 1 @@ -109,20 +92,12 @@ #define FL_OFFSET 5 #define FL_STEPCOUNT 7 -// Colors define TabPage -// only temporarily!!! -// #define RID_SVXPAGE_COLOR 999 - -//#define GRP_COLORTABLE 1 -//#define GRP_COLORMODEL 2 - #define BTN_WORK_ON 2 #define CTL_COLORTABLE 3 #define CTL_PREVIEW_OLD 1 #define CTL_PREVIEW_NEW 2 #define FT_NAME 2 #define EDT_NAME 1 -// #define LB_COLOR 1 #define LB_COLORMODEL 2 #define FT_1 3 #define FT_2 4 @@ -135,9 +110,7 @@ #define FT_TABLE_NAME 7 #define MTR_FLD_X_SIZE 4 #define MTR_FLD_Y_SIZE 5 -#define GRP_SIZE 6 #define TSB_SCALE 1 -#define GRP_POSITION 7 #define FT_X_OFFSET 1 #define FT_Y_OFFSET 2 #define MTR_FLD_X_OFFSET 1 @@ -146,7 +119,6 @@ #define RBT_ROW 6 #define RBT_COLUMN 7 #define MTR_FLD_OFFSET 3 -#define GRP_OFFSET 8 #define FT_TRANSPARENT 9 #define FT_X_SIZE 10 @@ -156,8 +128,6 @@ #define RBT_TRANS_OFF 8 #define RBT_TRANS_LINEAR 9 #define RBT_TRANS_GRADIENT 10 -#define GRP_TRANS_MODE 9 -#define GRP_TRANS_GRADIENT 10 #define CTL_TRANS_PREVIEW 19 #define FT_TRGR_TYPE 12 @@ -179,13 +149,10 @@ #define MTR_SHADOW_TRANSPARENT 11 // Hatch-Background on Area-TabPage -#define GRP_HATCHBCKGRD 20 #define CB_HATCHBCKGRD 21 #define LB_HATCHBCKGRDCOLOR 22 -#define IMG_LOAD_H 23 -#define IMG_SAVE_H 24 // IAccessibility2 implementation 2009 ------ #define STR_CUI_COLORMODEL 5030 #define STR_LB_HATCHINGSTYLE 5031 diff --git a/cui/source/tabpages/tabline.hrc b/cui/source/tabpages/tabline.hrc index 81e9e99e5061..d89a617fe2b9 100644 --- a/cui/source/tabpages/tabline.hrc +++ b/cui/source/tabpages/tabline.hrc @@ -35,8 +35,6 @@ #define TSB_INVISIBLE 1 #define FL_LINE 1 #define FL_LINE_ENDS 2 -#define FT_LINE_START 4 -#define FT_LINE_END 8 #define FT_LINE_ENDS_STYLE 5 #define FT_LINE_ENDS_WIDTH 6 #define LB_START_STYLE 3 @@ -59,16 +57,13 @@ #define MTR_FLD_START_WIDTH 3 #define MTR_FLD_END_WIDTH 2 #define CBX_SYNCHRONIZE 1 -#define FL_MEASURING 3 #define CTL_POSITION 2 #define FT_POSITION 9 -#define TSB_SHOW_MEASURING 2 #define CTL_PREVIEW 1 #define FL_DEFINITION 1 #define FT_NUMBER 3 #define FT_DISTANCE 2 #define FT_LENGTH 4 -#define TSB_SYNCHRONIZE 3 #define LB_TYPE_1 3 #define FT_TYPE 1 #define LB_TYPE_2 1 diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc index 2d57b7208f68..a5b32eaaff24 100644 --- a/cui/source/tabpages/transfrm.hrc +++ b/cui/source/tabpages/transfrm.hrc @@ -33,7 +33,6 @@ #define MTR_FLD_POS_X 7 #define MTR_FLD_POS_Y 8 #define CBX_COPY 9 -#define TSB_PROTECT 10 #define TSB_AUTO 11 #define TSB_AUTOGROW_HEIGHT 12 #define TSB_AUTOGROW_WIDTH 13 @@ -55,7 +54,6 @@ #define MTR_FLD_RADIUS 29 #define FL_ANGLE 30 #define FT_ANGLE 31 -#define TSB_VERTICAL 32 #define FL_ANCHOR 33 #define FT_ANCHOR 34 #define LB_ANCHOR 35 diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index b3d97a03cec7..aac74fff2c3d 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -261,8 +261,6 @@ #define HID_DSADMIN_USER_DEFINED "DBACCESS_HID_DSADMIN_USER_DEFINED" #define HID_DSADMIN_USERDEF_OPTIONS "DBACCESS_HID_DSADMIN_USERDEF_OPTIONS" #define HID_DSADMIN_CHARSET_USERDEF "DBACCESS_HID_DSADMIN_CHARSET_USERDEF" -#define HID_DSADMIN_USER_LDAP "DBACCESS_HID_DSADMIN_USER_LDAP" -#define HID_DSADMIN_PWDREC_LDAP "DBACCESS_HID_DSADMIN_PWDREC_LDAP" #define HID_DSADMIN_USESSL_LDAP "DBACCESS_HID_DSADMIN_USESSL_LDAP" #define HID_BROWSER_QUERY_WIZARD "DBACCESS_HID_BROWSER_QUERY_WIZARD" diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc index d07b88563691..1fcf3c638560 100644 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ b/dbaccess/source/ui/app/dbu_app.hrc @@ -22,7 +22,6 @@ #include "dbu_resource.hrc" #endif -#define TBI_SWITCH_PREVIEW RID_DBACCESS_START #define RID_STR_NEW_FORM RID_STR_APP_START #define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index c4905ae5ac1b..e6f720f588a1 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -16,7 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef _DBAUI_AUTOCONTROLS_HRC_ #define _DBAUI_AUTOCONTROLS_HRC_ @@ -432,9 +431,6 @@ }; -#define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT) -#define BROWSECONTROLGROUP_HEIGHT ( FIXEDTEXT_HEIGHT + 2 + BUTTON_HEIGHT) - // -------------------------------------------------------------------------------------------------- #define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2) \ @@ -442,9 +438,6 @@ AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID, AUTO_HID2) -// -------------------------------------------------------------------------------------------------- - - // -------------------------------------------------------------------------------------------------- #define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2) \ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc index 49484b09f1f6..c0013365a4a0 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hrc +++ b/dbaccess/source/ui/dlg/ConnectionPage.hrc @@ -24,16 +24,10 @@ #define FT_USERNAME 1 #define FT_JDBCDRIVERCLASS 2 -#define FT_DBASE_PATH_OR_FILE 3 -#define FT_NAME_OF_ODBC_DATASOURCE 4 #define FT_MYSQL_DATABASE_NAME 5 -#define FT_MSACCESS_MDB_FILE 6 -#define FT_FLAT_PATH_OR_FILE 7 -#define FT_CALC_PATH_OR_FILE 8 // FREE #define FT_NO_ADDITIONAL_SETTINGS 10 #define FT_HOSTNAME 11 -#define FT_ORACLE_DATABASE_NAME 12 #define ET_USERNAME 1 #define ET_JDBCDRIVERCLASS 2 diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc index 43781afb2249..e23142b6104e 100644 --- a/dbaccess/source/ui/dlg/dbadmin.hrc +++ b/dbaccess/source/ui/dlg/dbadmin.hrc @@ -84,19 +84,10 @@ #define STR_PAGETITLE_GENERAL 1 #define STR_PAGETITLE_CONNECTION 2 #define STR_PAGETITLE_ADVANCED 3 -#define STR_NO_WILDCARDS 4 #define STR_MYSQLENTRY 5 #define STR_PARENTTITLE 6 #define STR_COULDNOTLOAD_ODBCLIB 7 #define STR_UNSUPPORTED_DATASOURCE_TYPE 8 -#define STR_MYSQL_CONFIG_NEXT_PAGE 9 -#define STR_JDBC_DEFAULT_URL 10 - -//======================================================================== -// menu item ids -#define MID_NEW_DATASOURCE 1 -#define MID_DELETE_DATASOURCE 2 -#define MID_RESTORE_DATASOURCE 3 #endif // _DBAUI_DBADMIN_HRC_ diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc index 500f693022fb..1f0b01c89286 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.hrc +++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc @@ -41,8 +41,6 @@ #define STR_MYSQLJDBC_HELPTEXT 35 #define STR_SPREADSHEET_HELPTEXT 36 // FREE -#define STR_FINAL_HELPTEXT 38 - // FREE #define STR_ORACLE_HELPTEXT 40 #define STR_DBASE_HEADERTEXT 41 #define STR_MSACCESS_HEADERTEXT 42 @@ -54,19 +52,12 @@ #define STR_MYSQLJDBC_HEADERTEXT 48 // FREE #define STR_SPREADSHEET_HEADERTEXT 50 -#define STR_FINAL_HEADERTEXT 52 // FREE #define STR_ORACLE_HEADERTEXT 54 -#define STR_GENERAL_HEADERTEXT 55 #define STR_DBWIZARDTITLE 56 -#define STR_DEFAULTLDAPPORTNUMBER 60 - // FREE -#define STR_ODBCDATASOURCENAME 63 #define STR_SPREADSHEETPATH 64 -#define STR_DBLOCATIONLABEL 65 -#define STR_ADMIN_HELPTEXT 66 #define STR_ORACLE_DEFAULT 67 #define STR_PAGETITLE_INTROPAGE 69 @@ -90,12 +81,10 @@ #define STR_PAGETITLE_MYSQL_NATIVE 87 -#define FT_PORTNUMBERDEFAULT 1 #define FT_LDAP_HELPTEXT 2 #define FT_MYSQL_HELPTEXT 3 #define FT_MYSQL_HEADERTEXT 4 #define FT_MYSQLCONNECTIONMODE 5 -#define FT_BROWSEURL 6 #define FT_AUTHENTIFICATIONHELPTEXT 7 #define FT_AUTHENTIFICATIONHEADERTEXT 8 #define FT_LDAP_HEADERTEXT 9 diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc index 33e93a144828..be32311455d5 100644 --- a/dbaccess/source/ui/dlg/paramdialog.hrc +++ b/dbaccess/source/ui/dlg/paramdialog.hrc @@ -23,12 +23,9 @@ #define FL_PARAMS 2 #define FT_VALUE 3 #define ET_PARAM 4 -#define CB_NULLVAL 5 #define BT_TRAVELNEXT 6 #define BT_OK 7 #define BT_CANCEL 8 -#define AB_PREV 9 -#define AB_NEXT 10 #define STR_COULD_NOT_CONVERT_PARAM 1 diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc index 2c04152104ad..d183c39e8a25 100644 --- a/dbaccess/source/ui/dlg/queryfilter.hrc +++ b/dbaccess/source/ui/dlg/queryfilter.hrc @@ -43,7 +43,6 @@ #define ET_WHEREVALUE3 3 #define STR_NOENTRY 1 -#define STR_NOENTRY2 2 #define STR_DEFAULT 3 #define STR_COMPARE_OPERATORS 4 diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc index 7e4091dd4436..8b9287736636 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hrc @@ -43,7 +43,6 @@ #define INIT_Y 28 #define INDENTED_X 6 #define INDENT_BELOW_RADIO 10 -#define INDENT_BELOW_CHECK 10 // FREE @@ -110,7 +109,6 @@ #define STR_EXCEPTION_INFO RID_STR_DLG_START + 64 #define STR_EXCEPTION_DETAILS RID_STR_DLG_START + 65 #define STR_MSACCESS_2007_FILTERNAME RID_STR_DLG_START + 66 -#define STR_MSACCESS_ACCDB_FILE RID_STR_DLG_START + 67 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index 1c1fb3e6973f..9686f8ab8a02 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -23,8 +23,6 @@ #endif -#define STR_QRY_FUNCTIONS RID_STR_QRY_START -#define STR_QRY_SORTTEXT RID_STR_QRY_START + 1 #define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 #define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 #define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4 diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 41da16e62a42..6364b2328587 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -79,7 +79,6 @@ #define DLG_DATABASE_ADMINISTRATION RID_DIALOG_START + 0 #define DLG_DBASE_INDEXES RID_DIALOG_START + 1 -#define DLG_SQLMESSAGE RID_DIALOG_START + 2 #define DLG_SQLEXCEPTIONCHAIN RID_DIALOG_START + 3 #define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4 #define DLG_PARAMETERS RID_DIALOG_START + 5 @@ -119,7 +118,6 @@ // FREE #define PAGE_CONNECTION RID_PAGE_START + 6 #define PAGE_ADO RID_PAGE_START + 7 -#define PAGE_QUERYADMINISTRATION RID_PAGE_START + 8 #define TAB_WIZ_COLUMN_SELECT RID_PAGE_START + 9 #define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10 #define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11 @@ -139,17 +137,14 @@ #define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 // FREE #define PAGE_MOZILLA RID_PAGE_START + 32 -#define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33 -#define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40 #define PAGE_DBWIZARD_DBASE RID_PAGE_START + 41 #define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42 #define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43 #define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44 // FREE #define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46 -#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 #define PAGE_DBWIZARD_ORACLE RID_PAGE_START + 48 #define PAGE_DBWIZARD_JDBC RID_PAGE_START + 49 #define PAGE_DBWIZARD_ADO RID_PAGE_START + 50 @@ -164,8 +159,6 @@ //======================================================================== // error boxes -#define ERR_NOREGISTEREDDATASOURCES RID_ERRORBOX_START + 0 -// free #define ERR_QRY_CRITERIA_ON_ASTERISK RID_ERRORBOX_START + 2 #define ERR_QRY_ORDERBY_ON_ASTERISK RID_ERRORBOX_START + 3 #define ERR_QRY_AMB_FIELD RID_ERRORBOX_START + 4 @@ -175,7 +168,6 @@ #define ERR_NEED_INDEX_FIELDS RID_ERRORBOX_START + 8 #define ERR_QRY_NOSTATEMENT RID_ERRORBOX_START + 9 #define ERR_QRY_NOCRITERIA RID_ERRORBOX_START + 10 -#define ERR_CANTDOTABLEACTION RID_ERRORBOX_START + 11 @@ -212,8 +204,6 @@ // free #define IMG_PKEYICON RID_IMAGE_START + 12 // free -#define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15 -// free #define REPORTFOLDER_TREE_ICON RID_IMAGE_START + 24 #define IMG_FORMFOLDER_TREE_L RID_IMAGE_START + 39 #define IMG_REPORTFOLDER_TREE_L RID_IMAGE_START + 40 @@ -232,19 +222,13 @@ #define IMG_JOINS RID_IMAGELIST_START + 0 #define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1 #define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3 -#define IMP_FORM_SC RID_IMAGELIST_START + 5 -#define IMP_FORM_LC RID_IMAGELIST_START + 7 -#define IMP_REPORT_SC RID_IMAGELIST_START + 9 -#define IMP_REPORT_LC RID_IMAGELIST_START + 11 //======================================================================== // menus #define MENU_TABLETREE_POPUP RID_MENU_START + 0 -#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1 #define RID_SBA_GRID_COLCTXMENU RID_MENU_START + 2 #define RID_SBA_GRID_ROWCTXMENU RID_MENU_START + 3 -#define MENU_BROWSERTREE_CONTEXT RID_MENU_START + 4 #define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5 #define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6 #define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7 @@ -314,21 +298,13 @@ #define RSC_CHARSETS RID_UNTYPED_START + 2 #define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 -#define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5 -#define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7 -#define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9 -#define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11 -#define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13 -#define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15 //======================================================================== // various #define PB_FORMAT RID_MISC_START + 0 -#define FIXED_NO_CONNECTION RID_MISC_START + 1 #define LB_LEFT_TABLE RID_MISC_START + 2 #define LB_RIGHT_TABLE RID_MISC_START + 3 -#define LB_CONTROL RID_MISC_START + 4 #define FL_INVOLVED_TABLES RID_MISC_START + 5 #define FL_INVOLVED_FIELDS RID_MISC_START + 6 diff --git a/dbaccess/source/ui/inc/sbagrid.hrc b/dbaccess/source/ui/inc/sbagrid.hrc index fb7f8f91c467..7589af52e8cb 100644 --- a/dbaccess/source/ui/inc/sbagrid.hrc +++ b/dbaccess/source/ui/inc/sbagrid.hrc @@ -22,20 +22,7 @@ //----------------Menueitems------------------------------------------------- // Tabelle #define SBA_WHICHID_START 100 -// Zeilenhoehe -#define SBA_DEF_ROWHEIGHT (SBA_WHICHID_START+131) // SbaColRowSizeItem -#define SBA_DEF_RANGEFONT (SBA_WHICHID_START+132) // RangeItem -#define SBA_DEF_FONT (SBA_WHICHID_START+133) // SvxFontItem -#define SBA_DEF_FONTHEIGHT (SBA_WHICHID_START+134) // SvxFontHeightItem -#define SBA_DEF_FONTCOLOR (SBA_WHICHID_START+135) // SvxColorItem -#define SBA_DEF_FONTWEIGHT (SBA_WHICHID_START+136) // SvxWeightItem -#define SBA_DEF_POSTURE (SBA_WHICHID_START+137) // SvxPostureItem -#define SBA_DEF_SHADOWED (SBA_WHICHID_START+138) // SvxShadowedItem -#define SBA_DEF_CONTOUR (SBA_WHICHID_START+139) // SvxContourItem -#define SBA_DEF_CROSSEDOUT (SBA_WHICHID_START+140) // SvxCrossedOutItem -#define SBA_DEF_UNDERLINE (SBA_WHICHID_START+141) // SvxUnderlineItem -#define SBA_DEF_LANGUAGE (SBA_WHICHID_START+142) // SvxLanguageItem // Spalten // Formatierung @@ -77,22 +64,5 @@ #define SBA_DEF_FLTTABLE (SBA_WHICHID_START + 151) // SfxStringItem // Spalte ausblenden #define SBA_DEF_FLTHIDE (SBA_WHICHID_START + 152) // SfxBoolItem -// Kommentar zum Feld -#define SBA_DEF_FLTCOMMENT (SBA_WHICHID_START + 153) // SfxStringItem -// default wert -#define SBA_DEF_FLTDEFAULT (SBA_WHICHID_START + 154) // SfxStringItem -// Primärschluessel -#define SBA_DEF_FLTPRIMARY (SBA_WHICHID_START + 155) // SfxBoolItem -// table properties -#define SBA_DEF_TABLEPROP (SBA_WHICHID_START + 156) // SfxString -#define SBA_DEF_SORT (SBA_WHICHID_START + 157) // SfxString -#define SBA_DEF_FILTER (SBA_WHICHID_START + 158) // SfxString -#define SBA_DEF_FILTERAPPLIED (SBA_WHICHID_START + 159) // SfxBool -#define SBA_DEF_ROWHEIGHT_DEFAULT (SBA_WHICHID_START + 160) // SfxBool -// the col has a default width ? -#define SBA_DEF_FLTCOLWIDTH_DEFAULT (SBA_WHICHID_START + 161) // SfxBool -#define SBA_DEF_WORDLINEMODE (SBA_WHICHID_START + 162) // SfxBool - - #endif // DBACCESS_SBA_GRID_HRC diff --git a/dbaccess/source/ui/querydesign/querydlg.hrc b/dbaccess/source/ui/querydesign/querydlg.hrc index 110655b2749c..b0ad67932fb4 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hrc +++ b/dbaccess/source/ui/querydesign/querydlg.hrc @@ -28,7 +28,6 @@ #define LB_JOINTYPE 1 -#define GB_FIELDS 1 #define CB_NATURAL 1 diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index d08f87911c7a..6662fe5e1563 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -49,7 +49,6 @@ #define TXT_DLG_CMDLINEHELP_BOTTOM (RID_DESKTOP_DIALOG_START+105) #define BTN_DLG_CMDLINEHELP_OK (RID_DESKTOP_DIALOG_START+106) -#define QBX_CONFIG_IMPORTSETTINGS (RID_DESKTOP_DIALOG_START+180) #define EBX_ERR_PRINTDISABLED (RID_DESKTOP_DIALOG_START+190) diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index ba03872ff8c8..4d4763d3d1b4 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -161,7 +161,6 @@ #define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97) #define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98) -#define WARNINGBOX_CONCURRENTINSTANCE (RID_DEPLOYMENT_GUI_START+100) #define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101) #define RID_WARNINGBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+102) diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index d96b12196342..182f3080b378 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -59,7 +59,6 @@ #define HID_EXTENSION_MANAGER_LISTBOX_DISABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE" #define HID_EXTENSION_MANAGER_LISTBOX_REMOVE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE" -#define HID_EXTENSION_DEPENDENCIES "DESKTOP_HID_EXTENSION_DEPENDENCIES" #define HID_PACKAGE_MANAGER_UPD_REQ "DESKTOP_HID_PACKAGE_MANAGER_UPD_REQ" diff --git a/editeng/inc/editeng/editids.hrc b/editeng/inc/editeng/editids.hrc index 2fd88fc28395..d9d4b95b1703 100644 --- a/editeng/inc/editeng/editids.hrc +++ b/editeng/inc/editeng/editids.hrc @@ -234,10 +234,6 @@ #error Resource-Ueberlauf in #line, #file #endif -#define SID_TEXT_ALIGNLEFT SID_ATTR_PARA_ADJUST_LEFT -#define SID_TEXT_ALIGNRIGHT SID_ATTR_PARA_ADJUST_RIGHT -#define SID_TEXT_ALIGNCENTER SID_ATTR_PARA_ADJUST_CENTER -#define SID_TEXT_ALIGNBLOCK SID_ATTR_PARA_ADJUST_BLOCK #define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL #endif diff --git a/editeng/inc/editeng/memberids.hrc b/editeng/inc/editeng/memberids.hrc index 45e059fef8f2..159e36c50a8a 100644 --- a/editeng/inc/editeng/memberids.hrc +++ b/editeng/inc/editeng/memberids.hrc @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _EDT_UNOMID_HXX #define _EDT_UNOMID_HXX @@ -128,8 +129,6 @@ #define MID_END_BRACKET 2 //ULSpaceItem -#define MID_UL_MARGIN 1 -#define MID_UL_REL_MARGIN 2 #define MID_UP_MARGIN 3 #define MID_LO_MARGIN 4 #define MID_UP_REL_MARGIN 5 @@ -137,10 +136,6 @@ #define MID_CTX_MARGIN 7 //LRSpaceItem -#define MID_LR_MARGIN 0 -#define MID_LRP_MARGIN 1 -#define MID_LR_REL_MARGIN 2 -#define MID_LRP_REL_MARGIN 3 #define MID_L_MARGIN 4 #define MID_R_MARGIN 5 #define MID_L_REL_MARGIN 6 @@ -189,10 +184,6 @@ #define MID_BREAK_BEFORE 0 #define MID_BREAK_AFTER 1 -//SvxCaseMapItem -#define MID_CASEMAP_VARIANT 0 -#define MID_CASEMAP_TRANS 1 - // SvxHorJustifyItem #define MID_HORJUST_HORJUST 0 #define MID_HORJUST_ADJUST 1 diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc index 0a94f1da40cb..6903fb7c4243 100644 --- a/extensions/inc/bibliography.hrc +++ b/extensions/inc/bibliography.hrc @@ -64,7 +64,6 @@ #define HID_BIB_CUSTOM4_POS "EXTENSIONS_HID_BIB_CUSTOM4_POS" #define HID_BIB_CUSTOM5_POS "EXTENSIONS_HID_BIB_CUSTOM5_POS" #define HID_BIB_DB_TBX "EXTENSIONS_HID_BIB_DB_TBX" -#define HID_BIB_DB_GHIDCTRL "EXTENSIONS_HID_BIB_DB_GHIDCTRL" #define HID_BIB_CONTROL_PAGE "EXTENSIONS_HID_BIB_CONTROL_PAGE" #define HID_BIB_CONTROL_PARENT "EXTENSIONS_HID_BIB_CONTROL_PARENT" #define UID_BIB_FRAME_WINDOW "EXTENSIONS_UID_BIB_FRAME_WINDOW" diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc index 214601662283..52236bdc4b45 100644 --- a/extensions/inc/dbpilots.hrc +++ b/extensions/inc/dbpilots.hrc @@ -27,10 +27,6 @@ #ifndef EXTENSIONS_DBPILOT_HRC #define EXTENSIONS_DBPILOT_HRC -#define HID_GHIDWIZARD_PREVIOUS "EXTENSIONS_HID_GHIDWIZARD_PREVIOUS" -#define HID_GHIDWIZARD_NEXT "EXTENSIONS_HID_GHIDWIZARD_NEXT" -#define HID_GHIDWIZARD_CANCEL "EXTENSIONS_HID_GHIDWIZARD_CANCEL" -#define HID_GHIDWIZARD_FINISH "EXTENSIONS_HID_GHIDWIZARD_FINISH" #define HID_GROUPWIZARD_PREVIOUS "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS" #define HID_GROUPWIZARD_NEXT "EXTENSIONS_HID_GROUPWIZARD_NEXT" #define HID_GROUPWIZARD_CANCEL "EXTENSIONS_HID_GROUPWIZARD_CANCEL" diff --git a/extensions/inc/extensio.hrc b/extensions/inc/extensio.hrc index bd643892d42f..681008fe6469 100644 --- a/extensions/inc/extensio.hrc +++ b/extensions/inc/extensio.hrc @@ -46,30 +46,4 @@ #error id range overflow #endif -// ----------------------------------------------------------------------- -// - help id ranges - -#define HID_DBP_START ( HID_EXTENSIONS_START + 0 ) -#define HID_DBP_END ( HID_EXTENSIONS_START + 19 ) - -#define HID_ABP_START ( HID_EXTENSIONS_START + 20 ) -#define HID_ABP_END ( HID_EXTENSIONS_START + 39 ) - -#define HID_BIBLIO_START ( HID_EXTENSIONS_START + 40 ) -#define HID_BIBLIO_END ( HID_EXTENSIONS_START + 89 ) - -#define HID_PROPC_START ( HID_EXTENSIONS_START + 90 ) -#define HID_PROPC_END ( HID_EXTENSIONS_START + 499 ) - -#define HID_UPDATE_START ( HID_EXTENSIONS_START + 500 ) -#define HID_UPDATE_END ( HID_EXTENSIONS_START + 519 ) - -// !!! please adjust HID_LAST_EXTENSIONS_RANGE if you add new ranges here !!! - -#define HID_LAST_EXTENSIONS_RANGE HID_UPDATE_END - -#if HID_LAST_EXTENSIONS_RANGE > HID_EXTENSIONS_END - #error id range overflow -#endif - #endif diff --git a/extensions/source/bibliography/sections.hrc b/extensions/source/bibliography/sections.hrc index 5d146e04ce53..d87aaa7f7502 100644 --- a/extensions/source/bibliography/sections.hrc +++ b/extensions/source/bibliography/sections.hrc @@ -28,21 +28,6 @@ #include "bib.hrc" //General -/*#define FT_FIRST_MIDDLE 1 -#define ED_FIRST 2 -#define ED_MIDDLE 3 -#define FT_NAME_SUFFIX 4 -#define ED_NAME 5 -#define CB_SUFFIX 6 -#define ED_INITIALS 8 -#define FT_COMPANY 9 -#define ED_COMPANY 10 -#define FT_DEPARTMENT 11 -#define ED_DEPARTMENT 12 -#define FT_SALUTATION 13 -#define CB_SALUTATION 14 -#define FT_SHOWNNAME 15 -#define ED_SHOWNNAME 16*/ #define FT_IDENTIFIER 1 #define FT_AUTHTYPE 2 #define FT_AUTHOR 3 @@ -83,19 +68,14 @@ #define FL_3 36 //Business Address -#define FT_OFFICE 1 #define FT_STREET 2 #define FT_CITY 3 -#define FT_STATE 4 #define FT_COUNTRY 5 -#define FT_ZIP 6 -#define ED_OFFICE 7 #define ED_STREET 8 #define ED_CITY 9 #define ED_STATE 10 #define ED_COUNTRY 11 #define ED_ZIP 12 -#define ED_POBOX 13 //Popup SectionControl diff --git a/extensions/source/bibliography/toolbar.hrc b/extensions/source/bibliography/toolbar.hrc index 05c81921e44d..a9ac1f3a99b6 100644 --- a/extensions/source/bibliography/toolbar.hrc +++ b/extensions/source/bibliography/toolbar.hrc @@ -33,14 +33,5 @@ #define TBC_BT_AUTOFILTER 5 #define TBC_BT_FILTERCRIT 6 #define TBC_BT_REMOVEFILTER 7 -#define TBC_BT_NEWCARD 8 -#define TBC_BT_EDITCARD 9 -#define TBC_BT_REMOVECARD 10 -#define TBC_BT_INSERT 11 -#define TBC_BT_UPDATE 12 -#define TBC_BT_MAIL 13 -#define TBC_BT_URL 14 #define TBC_BT_COL_ASSIGN 15 #define TBC_BT_CHANGESOURCE 16 -#define IL_TOOLBOX 17 -#define ILH_TOOLBOX 18 diff --git a/extensions/source/scanner/sanedlg.hrc b/extensions/source/scanner/sanedlg.hrc index 2c20ad1c6fd3..9eb79b3153ff 100644 --- a/extensions/source/scanner/sanedlg.hrc +++ b/extensions/source/scanner/sanedlg.hrc @@ -75,8 +75,6 @@ #define PREVIEW_UPPER_TOP SCAN_AREA_TOP + 80 #define PREVIEW_WIDTH 113 #define PREVIEW_HEIGHT 160 -#define PREVIEW_BOTTOM PREVIEW_UPPER_TOP + PREVIEW_HEIGHT -#define PREVIEW_RIGHT PREVIEW_UPPER_LEFT + PREVIEW_WIDTH #define SECOND_COLUMN PREVIEW_WIDTH + 20 #define THIRD_COLUMN SECOND_COLUMN + 135 diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc index 8c50b5ad87b3..9b933b1e2de9 100644 --- a/filter/inc/filter.hrc +++ b/filter/inc/filter.hrc @@ -43,14 +43,11 @@ #define DLG_EXPORT_GIF (RID_GOODIES_START+ 1) #define DLG_EXPORT_EMET (RID_GOODIES_START+ 2) #define DLG_EXPORT_JPG (RID_GOODIES_START+ 3) -#define DLG_IMPORT_PCD (RID_GOODIES_START+ 4) #define DLG_EXPORT_EPNG (RID_GOODIES_START+ 5) #define DLG_EXPORT_EPS (RID_GOODIES_START+ 8) #define DLG_EXPORT_EPBM (RID_GOODIES_START+ 9) #define DLG_EXPORT_EPGM (RID_GOODIES_START+ 10) #define DLG_EXPORT_EPPM (RID_GOODIES_START+ 11) -#define DLG_SSL_NEWCERT (RID_GOODIES_START+ 12) -#define DLG_SSL_INFCERT (RID_GOODIES_START+ 13) // warning, next range is RID_FILTER_START + 100 ! diff --git a/filter/source/graphicfilter/icgm/cgmres.hrc b/filter/source/graphicfilter/icgm/cgmres.hrc index 420f1ff8fe1b..2f58d44e991a 100644 --- a/filter/source/graphicfilter/icgm/cgmres.hrc +++ b/filter/source/graphicfilter/icgm/cgmres.hrc @@ -24,5 +24,4 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define MB_CGM 1 #define MID_TEST 1 diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc index 25c46ce84f4d..547832abbd12 100644 --- a/filter/source/pdf/impdialog.hrc +++ b/filter/source/pdf/impdialog.hrc @@ -95,18 +95,6 @@ #define FT_WATERMARK 33 #define ED_WATERMARK 34 -#define FL_OLD_PAGES 51 -#define RB_OLD_ALL 52 -#define RB_OLD_RANGE 53 -#define RB_OLD_SELECTION 54 -#define ED_OLD_PAGES 55 -#define BT_OLD_OK 56 -#define BT_OLD_CANCEL 57 -#define BT_OLD_HELP 58 -#define FL_OLD_COMPRESSION 59 -#define RB_OLD_SCREEN 60 -#define RB_OLD_PRINT 61 -#define RB_OLD_PRESS 62 //controls for open options tab page #define FL_INITVIEW 80 diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 0c81f4ab81a7..b5ba26d5bb45 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -39,10 +39,6 @@ #define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) -#define STR_FILTER_DOWNLOAD (RID_FWK_START+0) -#define STR_FILTER_CHOOSER (RID_FWK_START+1) -#define STR_FILTER_OTHERS (RID_FWK_START+2) -#define STR_FILTER_ZIPPED (RID_FWK_START+3) // ResIds for BackingWindow #define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100) diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc index 18ab6d5b0181..52d3eae581d7 100644 --- a/reportdesign/inc/rptui_slotid.hrc +++ b/reportdesign/inc/rptui_slotid.hrc @@ -184,7 +184,6 @@ #define SID_ARRANGEMENU ( SID_RPTUI_START + 148 ) #define SID_SELECTALL_IN_SECTION ( SID_RPTUI_START + 149 ) -#define SID_ICON_GROUP ( SID_RPTUI_START + 150 ) #define SID_ICON_DETAIL ( SID_RPTUI_START + 151 ) #define SID_SECTION_ALIGN ( SID_RPTUI_START + 152 ) diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc index 47091374dec8..fe80f05a6f10 100644 --- a/reportdesign/source/ui/dlg/CondFormat.hrc +++ b/reportdesign/source/ui/dlg/CondFormat.hrc @@ -58,9 +58,6 @@ #define FL_SEPARATOR1 12 #define ED_CONDITION_RHS 13 #define CT_CONDITION 14 -#define CT_DEFAULT 15 -#define CT_CONDITION_1 16 -#define CT_CONDITION_2 17 #define SB_ALL_CONDITIONS 18 #define WND_COND_PLAYGROUND 19 #define BTN_MOVE_UP 20 diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index b02d250a14d6..e1bfc10f95d7 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -183,14 +183,12 @@ #define STR_TEXTATTRS 148 #define STR_HFCMD_DELIMITER 149 -#define HFCMD_START 150 #define STR_HFCMD_PAGE 150 #define STR_HFCMD_PAGES 151 #define STR_HFCMD_DATE 152 #define STR_HFCMD_TIME 153 #define STR_HFCMD_FILE 154 #define STR_HFCMD_TABLE 155 -#define HFCMD_END 155 #define STR_PROTECTIONERR 156 diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 6142f10a6653..23308eacf1bf 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef SC_SC_HRC #define SC_SC_HRC @@ -45,17 +46,16 @@ // areas #define SC_VIEW_START (SID_SC_START) -#define SC_VIEW_END (SID_SC_START + 99) +// SC_VIEW_END (SID_SC_START + 99) #define SC_MESSAGE_START (SID_SC_START + 100) -#define SC_MESSAGE_END (SID_SC_START + 199) +// SC_MESSAGE_END (SID_SC_START + 199) #define SC_FUNCTION_START (SID_SC_START + 200) -#define SC_FUNCTION_END (SID_SC_START + 299) +// SC_FUNCTION_END (SID_SC_START + 299) #define SC_PARAM_START (SID_SC_START + 300) -#define SC_PARAM_END (SID_SC_START + 399) +// SC_PARAM_END (SID_SC_START + 399) // stay compatible to the past #define SC_RESOURCE_START (RID_APP_START+5000) -#define SC_RESOURCE_END (RID_APP_END) // help IDs - // calc has a range of 2000 IDs @@ -74,7 +74,6 @@ #define HID_SC_SHEET_PAGE_REP (HID_SC_SHEET_START +11 ) // help IDs for shells (helper) (max. 20) -#define HID_SCSHELL_APP (HID_SC_SHELL_START +0 ) #define HID_SCSHELL_DOCSH (HID_SC_SHELL_START +1 ) #define HID_SCSHELL_DRAWSH (HID_SC_SHELL_START +2 ) #define HID_SCSHELL_DRTXTOB (HID_SC_SHELL_START +3 ) @@ -92,36 +91,14 @@ #define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) // view-functions (max. 100) -#define FID_TESTFUNC0 (SC_VIEW_START) -#define FID_TESTFUNC1 (SC_VIEW_START + 1) -#define FID_TESTFUNC2 (SC_VIEW_START + 2) -#define FID_TESTFUNC3 (SC_VIEW_START + 3) -#define FID_TESTFUNC4 (SC_VIEW_START + 4) -#define FID_TESTFUNC5 (SC_VIEW_START + 5) -#define FID_TESTFUNC6 (SC_VIEW_START + 6) -#define FID_TESTFUNC7 (SC_VIEW_START + 7) -#define FID_TESTFUNC8 (SC_VIEW_START + 8) -#define FID_TESTFUNC9 (SC_VIEW_START + 9) #define FID_SCALESTATUS (SC_VIEW_START + 10) -#define FID_COLOR (SC_VIEW_START + 11) #define SID_UPDATECHART (SC_VIEW_START + 13) -#define FID_MARKLEFT (SC_VIEW_START + 14) -#define FID_MARKRIGHT (SC_VIEW_START + 15) -#define FID_MARKUP (SC_VIEW_START + 16) -#define FID_MARKDOWN (SC_VIEW_START + 17) -#define FID_MARKPAGEUP (SC_VIEW_START + 18) -#define FID_MARKPAGEDOWN (SC_VIEW_START + 19) // Format options #define SID_SCFORMULAOPTIONS (SC_VIEW_START + 20) #define SID_SCDEFAULTSOPTIONS (SC_VIEW_START + 21) // slot-IDs for attributes -#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // alignment-page -#define SID_SCATTR_VER_JUSTIFY (SC_VIEW_START + 31) -#define SID_SCATTR_MARGIN (SC_VIEW_START + 32) -#define SID_SCATTR_STACKED (SC_VIEW_START + 33) -#define SID_SCATTR_LINEBREAK (SC_VIEW_START + 35) #define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) // protection-page // other slot-IDs: @@ -158,7 +135,6 @@ // misc: #define SID_LINKS (SC_VIEW_START + 60) #define SID_INSERT_SIMAGE (SC_VIEW_START + 61) -#define SID_INSERT_SCHART (SC_VIEW_START + 62) #define SID_INSERT_SMATH (SC_VIEW_START + 63) #define SID_STANDARD_FONTS (SC_VIEW_START + 64) #define SID_MIRROR_VERTICAL (SC_VIEW_START + 65) @@ -232,10 +208,8 @@ #define FID_REFMODECHANGED (SC_MESSAGE_START + 4) #define FID_KILLEDITVIEW (SC_MESSAGE_START + 5) #define SID_SOLVE (SC_MESSAGE_START + 6) -#define FID_FONT_SELECTED (SC_MESSAGE_START + 7) #define FID_FILTER_OK (SC_MESSAGE_START + 8) #define SC_HINT_DRWLAYER_NEW (SC_MESSAGE_START + 9) -#define SID_TABDELETED (SC_MESSAGE_START + 10) #define FID_INPUTLINE_MATRIX (SC_MESSAGE_START + 11) #define SID_DLG_RETOK (SC_MESSAGE_START + 12) #define FID_ANYDATACHANGED (SC_MESSAGE_START + 13) @@ -285,14 +259,10 @@ // functions -#define FID_DOC_MANAGER (SC_FUNCTION_START + 1) -#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2) -#define SID_MAIL (SC_FUNCTION_START + 3) #define SID_OPEN_CALC (SC_FUNCTION_START + 4) #define FILE_MENU_END (SC_FUNCTION_START + 20) #define EDIT_MENU_START (FILE_MENU_END) -#define FID_DELETE_CELLCONTENTS (EDIT_MENU_START + 1) #define FID_DELETE_CELL (EDIT_MENU_START + 2) #define FID_DELETE_TABLE (EDIT_MENU_START + 3) #define FID_FILL_TO_BOTTOM (EDIT_MENU_START + 4) @@ -301,10 +271,6 @@ #define FID_FILL_TO_LEFT (EDIT_MENU_START + 7) #define FID_FILL_TAB (EDIT_MENU_START + 8) #define FID_FILL_SERIES (EDIT_MENU_START + 9) -#define FID_SEARCH_REPLACE_DLG (EDIT_MENU_START + 10) -#define FID_EDIT_OBJECT (EDIT_MENU_START + 11) -#define SID_SC_NAVIGATOR (EDIT_MENU_START + 12) -#define SID_SC_WIZARD (EDIT_MENU_START + 13) #define SID_SC_EDIT_OBJECT (EDIT_MENU_START + 14) #define SID_HFEDIT (EDIT_MENU_START + 15) @@ -316,12 +282,10 @@ #define EDIT_MENU_END (EDIT_MENU_START + 20) #define VIEW_MENU_START (EDIT_MENU_END) -#define FID_TOGGLEOBJECT (VIEW_MENU_START) #define FID_TOGGLEINPUTLINE (VIEW_MENU_START + 1) #define FID_TOGGLEHEADERS (VIEW_MENU_START + 2) #define FID_SCALE (VIEW_MENU_START + 4) #define FID_TOGGLESYNTAX (VIEW_MENU_START + 5) -#define FID_SCREEN_OPTIONS (VIEW_MENU_START + 6) #define FID_PAGEBREAKMODE (VIEW_MENU_START + 7) #define FID_FUNCTION_BOX (VIEW_MENU_START + 8) #define FID_NORMALVIEWMODE (VIEW_MENU_START + 9) @@ -332,7 +296,6 @@ #define VIEW_MENU_END (VIEW_MENU_START + 20) #define INSERT_MENU_START (VIEW_MENU_END) -#define FID_PAGEBREAK (INSERT_MENU_START) #define FID_INS_ROWBRK (INSERT_MENU_START + 1) #define FID_INS_COLBRK (INSERT_MENU_START + 2) #define FID_DEL_ROWBRK (INSERT_MENU_START + 3) @@ -349,7 +312,6 @@ #define FID_APPLY_NAME (INSERT_MENU_START + 14) #define FID_INS_TABLE_EXT (INSERT_MENU_START + 15) #define FID_ADD_NAME (INSERT_MENU_START + 16) -#define SID_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! should come from Svx #define FID_INS_CELLSDOWN (INSERT_MENU_START + 18) #define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19) #define INSERT_MENU_END (INSERT_MENU_START + 20) @@ -368,7 +330,6 @@ #define FID_TABLE_SHOW (FORMAT_MENU_START + 10) #define SID_COLORSCALE (FORMAT_MENU_START + 11) #define SID_DATABAR (FORMAT_MENU_START + 12) -#define SID_SCSTYLES (FORMAT_MENU_START + 14) #define FID_MERGE_ON (FORMAT_MENU_START + 15) #define FID_MERGE_OFF (FORMAT_MENU_START + 16) #define SID_FORMATPAGE (FORMAT_MENU_START + 17) @@ -379,26 +340,17 @@ #define FORMAT_MENU_END (FORMAT_MENU_START + 22) #define EXTRA_MENU_START (FORMAT_MENU_END) -#define FID_VOICE_CONTROL (EXTRA_MENU_START + 1) -#define SID_RECALC_TITLE (EXTRA_MENU_START + 2) #define FID_AUTO_CALC (EXTRA_MENU_START + 3) #define FID_RECALC (EXTRA_MENU_START + 4) -#define FID_UPDATE_DIAGRAMS (EXTRA_MENU_START + 5) #define FID_PROTECT_TABLE (EXTRA_MENU_START + 6) #define FID_PROTECT_DOC (EXTRA_MENU_START + 7) -#define SID_EDIT_MACRO (EXTRA_MENU_START + 8) #define SID_SCOPTIONS (EXTRA_MENU_START + 9) -#define SID_MACRO_CHOOSER (EXTRA_MENU_START + 10) #define SID_SHARE_DOC (EXTRA_MENU_START + 11) #define SID_SCENARIOS (EXTRA_MENU_START + 12) #define SID_ADD_IN_MANAGER (EXTRA_MENU_START + 13) #define SID_PIVOT_RECALC (EXTRA_MENU_START + 14) #define SID_PIVOT_KILL (EXTRA_MENU_START + 15) -// wrong here, but better than nothing -#define SID_SC_HELP_PI (EXTRA_MENU_START + 16) -#define SID_SC_SHOW_KEYBOARD_HELP (EXTRA_MENU_START + 17) - #define FID_HARD_RECALC (EXTRA_MENU_START + 18) #define FID_AUTOCOMPLETE (EXTRA_MENU_START + 19) @@ -462,15 +414,9 @@ #define OBJBAR_FORMAT_END (OBJBAR_FORMAT_START+20) #define RID_INPUTBAR_START (OBJBAR_FORMAT_END) -#define SID_INPUT_WINDOW (RID_INPUTBAR_START) #define RID_INPUTBAR_END (RID_INPUTBAR_START+1) #define DRAW_BAR_START (RID_INPUTBAR_END) -#define SID_DRAWTOABOVE (DRAW_BAR_START+15) -#define SID_DRAWTOBELOW (DRAW_BAR_START+16) -#define SID_FRAMETOTOP (DRAW_BAR_START+19) -#define SID_FRAMETOBOTTOM (DRAW_BAR_START+20) -#define SID_TOOL_TEXT (DRAW_BAR_START+23) #define SID_ANCHOR_PAGE (DRAW_BAR_START+24) #define SID_ANCHOR_CELL (DRAW_BAR_START+25) #define SID_ANCHOR_TOGGLE (DRAW_BAR_START+26) @@ -479,9 +425,6 @@ #define DRAW_BAR_END (DRAW_BAR_START+50) #define DRAWTEXTBAR_START (DRAW_BAR_END) -#define SID_TEXT_LINESPACING_1 (DRAWTEXTBAR_START) -#define SID_TEXT_LINESPACING_2 (DRAWTEXTBAR_START+1) -#define SID_TEXT_LINESPACING_3 (DRAWTEXTBAR_START+2) #define DRAWTEXTBAR_END (DRAWTEXTBAR_START+20) #define DETECTIVE_START (DRAWTEXTBAR_END) @@ -521,7 +464,6 @@ #define SID_PREVIEW_PREVIOUS (SID_PREVIEW_START+1) #define SID_PREVIEW_FIRST (SID_PREVIEW_START+2) #define SID_PREVIEW_LAST (SID_PREVIEW_START+3) -#define SID_PREVIEW_GOTO (SID_PREVIEW_START+4) #define SID_PREVIEW_ZOOMIN (SID_PREVIEW_START+5) #define SID_PREVIEW_ZOOMOUT (SID_PREVIEW_START+6) #define SID_PREVIEW_CLOSE (SID_PREVIEW_START+7) @@ -571,7 +513,6 @@ #define SID_MARKAREA (SID_KEYFUNC_START + 33) -#define SID_AUTOFILL (SID_KEYFUNC_START + 34) #define FID_FILL_AUTO (SID_KEYFUNC_START + 35) #define SID_CANCEL (SID_KEYFUNC_START + 36) @@ -586,17 +527,8 @@ #define SID_KEYFUNC_END (SID_KEYFUNC_START + 50) #define SID_NEW_SLOTS (SID_KEYFUNC_END) -#define SID_NEW_SLOTS_END (SID_NEW_SLOTS+100) #define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) -#define SID_COL_START (SID_NEW_SLOTS+2) -#define SID_ROW_START (SID_NEW_SLOTS+3) -#define SID_COL_END (SID_NEW_SLOTS+4) -#define SID_ROW_END (SID_NEW_SLOTS+5) -#define SID_KEEP_MARK (SID_NEW_SLOTS+6) -#define SID_FILL_DIR (SID_NEW_SLOTS+7) -#define SID_FILL_COUNT (SID_NEW_SLOTS+8) -#define SID_WITH_UNDO (SID_NEW_SLOTS+9) #define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10) #define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11) #define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12) @@ -606,8 +538,6 @@ #define SID_SC_SELECTION (SID_NEW_SLOTS+15) #define SID_SC_CELLTEXT (SID_NEW_SLOTS+16) -#define SID_SC_NAME_TITLE (SID_NEW_SLOTS+17) - #define SID_SC_ACTIVECELL (SID_NEW_SLOTS+18) #define SID_SC_ACTIVETAB (SID_NEW_SLOTS+19) #define SID_RANGE_ROW (SID_NEW_SLOTS+20) @@ -615,7 +545,6 @@ #define SID_RANGE_TABLE (SID_NEW_SLOTS+22) #define SID_RANGE_VALUE (SID_NEW_SLOTS+23) #define SID_RANGE_FORMULA (SID_NEW_SLOTS+24) -#define SID_RANGE_TEXT (SID_NEW_SLOTS+25) #define SID_RANGE_TEXTVALUE (SID_NEW_SLOTS+26) #define SID_TABLE_ACTIVATE (SID_NEW_SLOTS+27) #define SID_TABLES_GET (SID_NEW_SLOTS+28) @@ -979,21 +908,6 @@ #define SCSTR_VALID_RANGE (STR_START + 317) #define SCSTR_VALID_LIST (STR_START + 318) -// formulator -#define SCSTR_FUDB (STR_START + 389) -#define SCSTR_FUDATE (STR_START + 390) -#define SCSTR_FUFIN (STR_START + 391) -#define SCSTR_FUINFO (STR_START + 392) -#define SCSTR_FULOG (STR_START + 393) -#define SCSTR_FUMATHS (STR_START + 394) -#define SCSTR_FUSTAT (STR_START + 395) -#define SCSTR_FUTAB (STR_START + 396) -#define SCSTR_FUTEXT (STR_START + 397) - -#define SCSTR_COMPILER_STRINGS (STR_START + 398) -#define SCSTR_FILTER_STRINGS (STR_START + 399) -#define SCSTR_COMPILER_INTL_STR (STR_START + 400) - // media shell #define SCSTR_MEDIASHELL (STR_START + 401) @@ -1202,7 +1116,6 @@ #define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 5) // data Form -#define SID_DATAFORM_NEW (SC_OOO_BUILD_START + 6) // message #define SID_DATA_FORM (SC_OOO_BUILD_START + 7) // menu (in Data menu) #define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 8) // dialog diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index c44e34fb46cd..dcaad2cf6169 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.hrc @@ -38,5 +38,4 @@ #define ID_FUNCTION_GRP_TEXT 10 #define ID_FUNCTION_GRP_ADDINS 11 -#define ID_FUNCTION_OFFSET 90 diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc index 244be15649ec..2517f0f3815c 100644 --- a/sc/source/ui/dbgui/pivot.hrc +++ b/sc/source/ui/dbgui/pivot.hrc @@ -34,12 +34,8 @@ #define BTN_OPTIONS 6 #define FL_LAYOUT 10 -#define FL_SELECT 90 -#define SCROLL_COL 91 #define WND_COL 11 -#define SCROLL_ROW 92 #define WND_ROW 12 -#define SCROLL_DATA 93 #define WND_DATA 13 #define WND_SELECT 14 #define WND_PAGE 18 @@ -49,7 +45,6 @@ #define STR_SELECT 34 #define FT_PAGE 35 -#define PTR_FIELD 18 #define FT_INFO 19 #define FL_OUTPUT 20 diff --git a/sc/source/ui/inc/datafdlg.hrc b/sc/source/ui/inc/datafdlg.hrc index bdb1ea962a82..a45338860444 100644 --- a/sc/source/ui/inc/datafdlg.hrc +++ b/sc/source/ui/inc/datafdlg.hrc @@ -36,7 +36,5 @@ #define WND_DATAFORM_SCROLLBAR 7 #define LAB_DATAFORM_RECORDNO 8 -#define FT_DATAFORM_FIXEDTEXT1 9 -#define ED_DATAFORM_EDIT1 10 #define STR_NEW_RECORD 11 diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc index 420e0fad9d67..2745ebbbfb26 100644 --- a/sc/source/ui/inc/miscdlgs.hrc +++ b/sc/source/ui/inc/miscdlgs.hrc @@ -132,13 +132,11 @@ #define BTN_RIGHT 3 #define BTN_TOP 4 #define BTN_BOTTOM 5 -#define FL_SEP11 10 #define FL_TYPE 11 #define BTN_ARITHMETIC 12 #define BTN_GEOMETRIC 13 #define BTN_DATE 14 #define BTN_AUTOFILL 15 -#define FL_SEP12 20 #define FL_TIME_UNIT 21 #define BTN_DAY 22 #define BTN_DAY_OF_WEEK 23 diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc index 34ccbfc5d63c..1a998cb29d1e 100644 --- a/sc/source/ui/inc/optdlg.hrc +++ b/sc/source/ui/inc/optdlg.hrc @@ -31,12 +31,10 @@ #define TP_GENERAL 1 #define TP_SAVE 2 #define TP_PATH 3 -#define TP_SPELL 4 #define TP_VIEW 5 #define TP_CALC 6 #define TP_USERLISTS 7 #define TP_PRINT 8 -#define TP_COLORS 9 #define TP_GRID 10 #define TP_CONTENT 11 #define TP_LAYOUT 12 @@ -59,7 +57,6 @@ #define FT_VALUE 13 #define GB_DATE 14 #define BTN_CASE 15 -#define FT_CASE 16 #define BTN_CALC 17 #define BTN_MATCH 18 #define BTN_LOOKUP 19 @@ -67,21 +64,11 @@ #define BTN_GENERAL_PREC 21 // TP_VIEW: -#define BTN_VSCROLL 1 -#define BTN_HSCROLL 2 -#define BTN_REGISTER 3 -#define BTN_OUTLINER 4 -#define BTN_HEADERFOOTER 5 #define BTN_GRID 6 -#define BTN_SYNTAX 7 -#define LB_GRIDCOLOR 9 -#define GB_ELEMENTS 10 -#define BTN_HELPLINES 11 #define BTN_FORMULAS 20 #define BTN_NULLVALS 21 #define BTN_NOTES 22 -#define GB_CONTENTS 23 // TP_USERLISTS: @@ -151,7 +138,6 @@ #define GB_UNIT 61 #define LB_UNIT 62 #define ST_UNIT 63 -#define GB_TAB 64 #define MF_TAB 65 #define CB_PAGEBREAKS 66 #define FT_TAB 69 diff --git a/sc/source/ui/inc/submenu.hrc b/sc/source/ui/inc/submenu.hrc index 4e5ad6d28d9e..2169061d7967 100644 --- a/sc/source/ui/inc/submenu.hrc +++ b/sc/source/ui/inc/submenu.hrc @@ -26,43 +26,8 @@ ************************************************************************/ // IDs fuer Untermenues - -// 1 ist nicht erlaubt ???? -#define SUBMENU_EDIT 2 -#define SUBMENU_FILL 3 -#define SUBMENU_DELBREAK 4 -#define SUBMENU_VIEW 5 -#define SUBMENU_INSERT 6 -#define SUBMENU_INSBREAK 7 #define SUBMENU_NAME 8 -#define SUBMENU_INSOBJ 9 -#define SUBMENU_DATA 10 -#define SUBMENU_FILTER 11 -#define SUBMENU_OUTLINE 12 -#define SUBMENU_PIVOT 13 -#define SUBMENU_EXTRA 14 -#define SUBMENU_AUDIT 15 -#define SUBMENU_PROTECT 16 -#define SUBMENU_ROW 17 -#define SUBMENU_COL 18 -#define SUBMENU_TAB 19 -#define SUBMENU_MERGE 20 -#define SUBMENU_AREA 21 -#define SUBMENU_MIRROR 22 #define SUBMENU_OBJARRANGE 23 #define SUBMENU_ANCHOR 24 -#define SUBMENU_POPARRANGE 25 -#define SUBMENU_OLEARRANGE 26 -#define SUBMENU_MAIL 27 -#define SUBMENU_OPTIONS 28 -#define SUBMENU_TOOLBARS 29 -#define SUBMENU_GRAPHIC 30 -#define SUBMENU_SPELLING 31 -#define SUBMENU_CELLCONT 32 #define SUBMENU_OBJMIRROR 33 -#define SUBMENU_OBJALIGN 34 -#define SUBMENU_OBJANCHOR 35 -#define SUBMENU_SENDTO 36 -#define SUBMENU_CHANGES 37 -#define SUBMENU_EDIT_TABLE 38 #define MN_TEMPLATES 39 diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index 0c26340599a1..0a2f364529bf 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -33,8 +33,6 @@ #define TP_PAGE_STD 1 #define TP_PAGE_HEADER 2 #define TP_PAGE_FOOTER 3 -#define TP_PAGE_TABLE 4 -#define TP_PAGE_AREAS 5 //================================================ // TabPage: Tabelle diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 00880e69d7fa..07c8d60c1954 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -76,27 +76,21 @@ #define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) #define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) -#define SID_BACKGROUND (SID_SD_START) -#define SID_LASTVERSION (SID_SD_START+1) #define SID_PAGESETUP (SID_SD_START+2) #define SID_COPYOBJECTS (SID_SD_START+4) #define SID_MANAGE_LINKS (SID_SD_START+5) -#define SID_CHOOSE (SID_SD_START+7) #define SID_CONVERT_TO_3D_LATHE (SID_SD_START+8) #define SID_DRAWINGMODE (SID_SD_START+9) #define SID_OUTLINEMODE (SID_SD_START+10) #define SID_DIAMODE (SID_SD_START+11) -#define SID_VIEWS (SID_SD_START+13) #define SID_INSERTPAGE (SID_SD_START+14) #define SID_INSERTFILE (SID_SD_START+15) #define SID_INSERTSYMBOL (SID_SD_START+16) #define SID_ZOOM_PANNING (SID_SD_START+17) #define SID_PRESENTATION_END (SID_SD_START+18) -#define SID_TEXTFORMAT (SID_SD_START+20) #define SID_POSITION (SID_SD_START+22) #define SID_MIRROR (SID_SD_START+23) #define SID_CONVERT (SID_SD_START+24) -#define SID_TEXT_FITTOTEXT (SID_SD_START+25) #define SID_COMBINE (SID_SD_START+26) #define SID_NAME_GROUP (SID_SD_START+27) #define SID_DRAWTBX_CONNECTORS (SID_SD_START+28) @@ -113,9 +107,7 @@ #define SID_CHANGEBEZIER (SID_SD_START+36) #define SID_CHANGEPOLYGON (SID_SD_START+37) #define SID_CAPTUREPOINT (SID_SD_START+38) -#define SID_EXECUTE_MACRO (SID_SD_START+39) #define SID_RULER (SID_SD_START+40) -#define SID_HELPKEYBOARD (SID_SD_START+42) #define SID_INSERTLAYER (SID_SD_START+43) #define SID_EDIT_OUTLINER (SID_SD_START+44) #define SID_SWITCHPAGE (SID_SD_START+45) @@ -128,7 +120,6 @@ #define SID_STARTAPP (SID_SD_START+52) #define SID_MASTERPAGE (SID_SD_START+53) #define SID_TOOL_CONNECTOR (SID_SD_START+58) -#define SID_ANIMATION (SID_SD_START+61) #define SID_ANIMATION_OBJECTS (SID_SD_START+62) #define SID_ANIMATION_EFFECTS (SID_SD_START+63) #define SID_PRESENTATION_LAYOUT (SID_SD_START+64) @@ -139,19 +130,13 @@ #define SID_NOTESMODE (SID_SD_START+69) #define SID_HANDOUTMODE (SID_SD_START+70) #define SID_LINEEND_POLYGON (SID_SD_START+71) -#define SID_OBJPALETTE_SELECT (SID_SD_START+72) #define SID_GRAPHIC_EXPORT (SID_SD_START+73) #define SID_SWITCH_POINTEDIT (SID_SD_START+74) -#define SID_RULER_NULLOFFSET (SID_SD_START+75) #define SID_TEXTEDIT (SID_SD_START+76) #define SID_SET_SNAPITEM (SID_SD_START+77) -#define SID_PRINT_PREVIEW (SID_SD_START+78) -#define SID_SEARCH_REPLACE (SID_SD_START+79) #define SID_DELETE_PAGE (SID_SD_START+80) #define SID_DELETE_LAYER (SID_SD_START+81) #define SID_DISMANTLE (SID_SD_START+82) -#define SID_SD_HELP_PI (SID_SD_START+83) -#define SID_TIPHELP (SID_SD_START+84) #define SID_STATUS_PAGE (SID_SD_START+86) #define SID_STATUS_LAYOUT (SID_SD_START+87) #define SID_STATUS_SELMODE (SID_SD_START+88) @@ -168,9 +153,6 @@ #define SID_SIZE_OPTIMAL (SID_SD_START+99) #define SID_OBJECT_TRANSPARENCE (SID_SD_START+100) #define SID_OBJECT_GRADIENT (SID_SD_START+101) -#define SID_OBJPALETTE_ADD (SID_SD_START+102) -#define SID_OBJPALETTE_MODIFY (SID_SD_START+103) -#define SID_OBJPALETTE_OBJECTS (SID_SD_START+104) #define SID_INSERT_IMAGE (SID_SD_START+105) #define SID_INSERT_MATH (SID_SD_START+106) #define SID_OBJECT_SHEAR (SID_SD_START+107) @@ -184,7 +166,6 @@ #define SID_CLEAR_UNDO_STACK (SID_SD_START+115) #define SID_BEHIND_OBJ (SID_SD_START+116) #define SID_REVERSE_ORDER (SID_SD_START+117) -#define SID_SDOPTIONS (SID_SD_START+118) #define SID_CONNECTOR_ARROW_START (SID_SD_START+119) #define SID_CONNECTOR_ARROW_END (SID_SD_START+120) @@ -224,7 +205,6 @@ #define SID_SNAP_POINTS (SID_SD_START+157) #define SID_QUICKEDIT (SID_SD_START+158) #define SID_PICK_THROUGH (SID_SD_START+159) -#define SID_COLORRESOLUTION (SID_SD_START+160) #define SID_CONVERT_TO_1BIT_THRESHOLD (SID_SD_START+161) #define SID_CONVERT_TO_1BIT_MATRIX (SID_SD_START+162) #define SID_CONVERT_TO_4BIT_GRAYS (SID_SD_START+163) @@ -267,7 +247,6 @@ #define ID_VAL_ISACTIVE (SID_SD_START+216) #define ID_VAL_WHATKIND (SID_SD_START+217) #define ID_VAL_PAGEWIDTH (SID_SD_START+218) -#define ID_VAL_PAGEMARGIN (SID_SD_START+219) #define ID_VAL_PAGETOP (SID_SD_START+220) #define ID_VAL_PAGEBOTTOM (SID_SD_START+221) #define ID_VAL_PAGELEFT (SID_SD_START+222) @@ -296,7 +275,6 @@ #define ID_VAL_DISTANCE (SID_SD_START+245) #define ID_VAL_INDEX (SID_SD_START+246) #define ID_VAL_WIDTH (SID_SD_START+247) -#define ID_VAL_HEIGHT (SID_SD_START+248) #define ID_VAL_PANEL_INDEX (SID_SD_START+249) // nur zum austesten, um nicht jedesmal APP:HRC ff. durchbuilden zu muessen @@ -307,9 +285,6 @@ #define ID_VAL_DUMMY4 (SID_SD_START+234) #define ID_VAL_DUMMY5 (SID_SD_START+235) #define ID_VAL_DUMMY6 (SID_SD_START+236) -#define ID_VAL_DUMMY7 (SID_SD_START+237) -#define ID_VAL_DUMMY8 (SID_SD_START+238) -#define ID_VAL_DUMMY9 (SID_SD_START+239) #define SID_MOVETO (SID_SD_START+250) #define SID_LINETO (SID_SD_START+251) @@ -380,7 +355,6 @@ #define SID_DRAWTBX_INSERT (SID_SD_START+318) #define SID_POLYGON_MORPHING (SID_SD_START+319) #define SID_MEASURE_DLG (SID_SD_START+320) -#define SID_EXPORT (SID_SD_START+321) #define SID_GRID_VISIBLE (SID_SD_START+322) #define SID_GRID_FRONT (SID_SD_START+323) #define SID_HELPLINES_VISIBLE (SID_SD_START+324) @@ -438,13 +412,6 @@ #define SID_EDIT_HYPERLINK (SID_SD_START+382) -#define SID_GRAFFILTER_SOBEL (SID_SD_START+390) -#define SID_GRAFFILTER_MOSAIC (SID_SD_START+391) -#define SID_GRAFFILTER_EMBOSS (SID_SD_START+392) -#define SID_GRAFFILTER_POSTER (SID_SD_START+393) -#define SID_GRAFFILTER_POPART (SID_SD_START+394) -#define SID_GRAFFILTER_SEPIA (SID_SD_START+395) -#define SID_GRAFFILTER_SOLARIZE (SID_SD_START+396) #define SID_OUTPUT_QUALITY_CONTRAST (SID_SD_START+400) #define SID_PREVIEW_QUALITY_CONTRAST (SID_SD_START+401) @@ -455,10 +422,7 @@ #define SID_HEADER_AND_FOOTER (SID_SD_START+407) #define SID_MASTER_LAYOUTS (SID_SD_START+408) -/* -#define SID_MASTER_LAYOUTS_NOTES (SID_SD_START+409) -#define SID_MASTER_LAYOUTS_HANDOUTS (SID_SD_START+410) -*/ + #define SID_INSERT_PAGE_NUMBER (SID_SD_START+411) #define SID_INSERT_DATE_TIME (SID_SD_START+412) diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 72ded387b3d4..04df57a4e4ab 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -43,13 +43,11 @@ #define STR_PRESOBJ_CHART RID_GLOB_START+10 #define STR_PRESOBJ_ORGCHART RID_GLOB_START+11 #define STR_PRESOBJ_TABLE RID_GLOB_START+12 -#define STR_PRESOBJ_IMAGE RID_GLOB_START+13 #define BMP_PRESOBJ_GRAPHIC RID_GLOB_START+14 #define BMP_PRESOBJ_OBJECT RID_GLOB_START+15 #define BMP_PRESOBJ_CHART RID_GLOB_START+16 #define BMP_PRESOBJ_ORGCHART RID_GLOB_START+17 #define BMP_PRESOBJ_TABLE RID_GLOB_START+18 -#define BMP_PRESOBJ_IMAGE RID_GLOB_START+19 #define STR_OUTLINEVIEWSHELL RID_GLOB_START+21 #define STR_DRAWVIEWSHELL RID_GLOB_START+22 #define STR_TEXTOBJECTBARSHELL RID_GLOB_START+23 @@ -79,7 +77,6 @@ #define STR_NOTES RID_GLOB_START+47 #define STR_HANDOUT RID_GLOB_START+48 #define STR_MASTERPAGE RID_GLOB_START+49 -#define STR_PRESOBJNOTESTEXT RID_GLOB_START+50 #define STR_BAD_PASSWORD_OR_FILE_CORRUPTED RID_GLOB_START+51 #define STR_UNDO_MOVEPAGES RID_GLOB_START+52 #define STR_NOT_ENOUGH_MEMORY RID_GLOB_START+53 @@ -118,8 +115,6 @@ #define STR_LAYOUT_DEFAULT_TITLE_NAME RID_GLOB_START+93 #define STR_GRAFOBJECTBARSHELL RID_GLOB_START+94 #define STR_POWERPOINT_IMPORT RID_GLOB_START+95 -#define STR_STAROFFICE_XML_DRAW RID_GLOB_START+96 -#define STR_STAROFFICE_XML_IMPRESS RID_GLOB_START+97 #define STR_PRESVIEWSHELL RID_GLOB_START+98 #define STR_LOAD_DOC RID_GLOB_START+99 #define STR_SAVE_DOC RID_GLOB_START+100 @@ -136,7 +131,6 @@ #define STR_SLIDE_NAME RID_GLOB_START+112 #define STR_LEFT_IMPRESS_PANE_SHELL RID_GLOB_START+113 #define STR_LEFT_DRAW_PANE_SHELL RID_GLOB_START+114 -#define STR_RIGHT_PANE_SHELL RID_GLOB_START+115 #define STR_TOOL_PANEL_SHELL RID_GLOB_START+116 #define RID_CUSTOMANIMATION_START RID_GLOB_START+120 diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 29ef8f128248..3dc75f8c4b68 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -34,8 +34,6 @@ // Anfang Page-Attribute #define ATTR_PAGE_START SID_SD_START + 1234 -#define ATTR_PAGE_NAME ATTR_PAGE_START -#define ATTR_PAGE_BACKGROUND ATTR_PAGE_START + 1 #define ATTR_PAGE_OBJECTS ATTR_PAGE_START + 2 #define ATTR_PAGE_LAYOUT ATTR_PAGE_START + 3 #define ATTR_PAGE_END ATTR_PAGE_LAYOUT @@ -57,7 +55,6 @@ #define ATTR_DIA_SPEED ATTR_DIA_START + 1 #define ATTR_DIA_AUTO ATTR_DIA_START + 2 #define ATTR_DIA_TIME ATTR_DIA_START + 3 -#define ATTR_DIA_SOUND ATTR_DIA_START + 4 #define ATTR_DIA_SOUNDFILE ATTR_DIA_START + 5 #define ATTR_DIA_END ATTR_DIA_SOUNDFILE @@ -83,39 +80,16 @@ // Transformations-Attribute #define ATTR_TRANSF_START ATTR_PRESENT_END + 1 -#define ATTR_TRANSF_POS_X ATTR_TRANSF_START -#define ATTR_TRANSF_POS_Y ATTR_TRANSF_START + 1 -#define ATTR_TRANSF_WIDTH ATTR_TRANSF_START + 2 -#define ATTR_TRANSF_HEIGHT ATTR_TRANSF_START + 3 -#define ATTR_TRANSF_SIZE_POINT ATTR_TRANSF_START + 4 -#define ATTR_TRANSF_ROT_X ATTR_TRANSF_START + 5 -#define ATTR_TRANSF_ROT_Y ATTR_TRANSF_START + 6 #define ATTR_TRANSF_ANGLE ATTR_TRANSF_START + 7 #define ATTR_TRANSF_END ATTR_TRANSF_ANGLE // Raster-Attribute #define ATTR_GRID_START ATTR_TRANSF_END + 1 -#define ATTR_GRID_USE ATTR_GRID_START -#define ATTR_GRID_DRAW_X ATTR_GRID_START + 1 -#define ATTR_GRID_DRAW_Y ATTR_GRID_START + 2 -#define ATTR_GRID_DIVISION_X ATTR_GRID_START + 3 -#define ATTR_GRID_DIVISION_Y ATTR_GRID_START + 4 -#define ATTR_GRID_SNAP_X ATTR_GRID_START + 5 -#define ATTR_GRID_SNAP_Y ATTR_GRID_START + 6 -#define ATTR_GRID_ORIGIN_X ATTR_GRID_START + 7 #define ATTR_GRID_ORIGIN_Y ATTR_GRID_START + 8 #define ATTR_GRID_END ATTR_GRID_ORIGIN_Y // Bildschirm-Attribute #define ATTR_DISPLAY_START ATTR_GRID_END + 1 -#define ATTR_DISPLAY_FUNCTIONBAR ATTR_DISPLAY_START -#define ATTR_DISPLAY_OBJECTBAR ATTR_DISPLAY_START + 1 -#define ATTR_DISPLAY_STATUSBAR ATTR_DISPLAY_START + 2 -#define ATTR_DISPLAY_TOOLBAR ATTR_DISPLAY_START + 3 -#define ATTR_DISPLAY_GRID ATTR_DISPLAY_START + 4 -#define ATTR_DISPLAY_RULER ATTR_DISPLAY_START + 5 -#define ATTR_DISPLAY_HELPLINES ATTR_DISPLAY_START + 6 -#define ATTR_DISPLAY_STRANGE_GRAPHIC ATTR_DISPLAY_START + 7 #define ATTR_DISPLAY_ADJUSTLINES ATTR_DISPLAY_START + 8 #define ATTR_DISPLAY_END ATTR_DISPLAY_ADJUSTLINES @@ -132,7 +106,6 @@ #define ATTR_ANIMATION_SOUNDON ATTR_ANIMATION_START + 6 #define ATTR_ANIMATION_SOUNDFILE ATTR_ANIMATION_START + 7 #define ATTR_ANIMATION_PLAYFULL ATTR_ANIMATION_START + 8 -#define ATTR_ANIMATION_TRANSPCOLOR ATTR_ANIMATION_START + 9 #define ATTR_ANIMATION_TEXTEFFECT ATTR_ANIMATION_START + 10 #define ATTR_ANIMATION_END ATTR_ANIMATION_TEXTEFFECT @@ -146,11 +119,6 @@ #define ATTR_ACTION_END ATTR_ACTION_PLAYFULL #define ATTR_PRINTOPTIONS_START ATTR_ACTION_END + 1 -#define ATTR_PRINTOPTIONS_PRINT ATTR_PRINTOPTIONS_START -#define ATTR_PRINTOPTIONS_PAGESIZE ATTR_PRINTOPTIONS_START + 1 -#define ATTR_PRINTOPTIONS_FADEOUT ATTR_PRINTOPTIONS_START + 2 -#define ATTR_PRINTOPTIONS_DATE ATTR_PRINTOPTIONS_START + 3 -#define ATTR_PRINTOPTIONS_TIME ATTR_PRINTOPTIONS_START + 4 #define ATTR_PRINTOPTIONS_PAGENAME ATTR_PRINTOPTIONS_START + 5 #define ATTR_PRINTOPTIONS_END ATTR_PRINTOPTIONS_PAGENAME @@ -188,36 +156,6 @@ #define ATTR_OPTIONS_SCALE_END ATTR_OPTIONS_SCALE_HEIGHT #define ATTR_PUBLISH_START ATTR_OPTIONS_SCALE_END + 1 -#define ATTR_PUBLISH_LOCATION ATTR_PUBLISH_START -#define ATTR_PUBLISH_WITHCONTENTSPAGE ATTR_PUBLISH_START + 1 -#define ATTR_PUBLISH_RESOLUTION ATTR_PUBLISH_START + 2 -#define ATTR_PUBLISH_MODE ATTR_PUBLISH_START + 3 -#define ATTR_PUBLISH_FORMAT ATTR_PUBLISH_START + 4 -#define ATTR_PUBLISH_COMPRESSION ATTR_PUBLISH_START + 5 -#define ATTR_PUBLISH_WITHNOTES ATTR_PUBLISH_START + 6 -#define ATTR_PUBLISH_AUTHOR ATTR_PUBLISH_START + 9 -#define ATTR_PUBLISH_EMAIL ATTR_PUBLISH_START + 10 -#define ATTR_PUBLISH_WWW ATTR_PUBLISH_START + 11 -#define ATTR_PUBLISH_INFO ATTR_PUBLISH_START + 12 -#define ATTR_PUBLISH_WITHDOWNLOAD ATTR_PUBLISH_START + 13 -#define ATTR_PUBLISH_WITHSTAROFFICE ATTR_PUBLISH_START + 14 -#define ATTR_PUBLISH_BUTTONS ATTR_PUBLISH_START + 15 -#define ATTR_PUBLISH_USERATTR ATTR_PUBLISH_START + 16 -#define ATTR_PUBLISH_BACKCOLOR ATTR_PUBLISH_START + 17 -#define ATTR_PUBLISH_TEXTCOLOR ATTR_PUBLISH_START + 18 -#define ATTR_PUBLISH_LINKCOLOR ATTR_PUBLISH_START + 19 -#define ATTR_PUBLISH_VLINKCOLOR ATTR_PUBLISH_START + 20 -#define ATTR_PUBLISH_ALINKCOLOR ATTR_PUBLISH_START + 21 -#define ATTR_PUBLISH_USEATTRIBS ATTR_PUBLISH_START + 22 -#define ATTR_PUBLISH_USECOLOR ATTR_PUBLISH_START + 23 -#define ATTR_PUBLISH_WEBSHOW ATTR_PUBLISH_START + 24 -#define ATTR_PUBLISH_SCRIPT ATTR_PUBLISH_START + 25 -#define ATTR_PUBLISH_URLPATH ATTR_PUBLISH_START + 26 -#define ATTR_PUBLISH_CGIPATH ATTR_PUBLISH_START + 27 -#define ATTR_PUBLISH_INDEX ATTR_PUBLISH_START + 28 -#define ATTR_PUBLISH_SLIDECHG ATTR_PUBLISH_START + 29 -#define ATTR_PUBLISH_SLIDEDURATION ATTR_PUBLISH_START + 30 -#define ATTR_PUBLISH_ENDLESS ATTR_PUBLISH_START + 31 #define ATTR_PUBLISH_SLIDESOUND ATTR_PUBLISH_START + 32 #define ATTR_PUBLISH_END ATTR_PUBLISH_SLIDESOUND @@ -230,11 +168,8 @@ // Pack & Go Attribute #define ATTR_PACKNGO_START ATTR_PRESLAYOUT_END + 1 -#define ATTR_PACKNGO_UNLINK ATTR_PACKNGO_START -#define ATTR_PACKNGO_COMPRESS ATTR_PACKNGO_START + 1 -#define ATTR_PACKNGO_SPANNING ATTR_PACKNGO_START + 2 #define ATTR_PACKNGO_MEDIUMSIZE ATTR_PACKNGO_START + 3 -#define ATTR_PACKNGO_END ATTR_PACKNGO_MEDIUMSIZE +// ATTR_PACKNGO_END ATTR_PACKNGO_MEDIUMSIZE // paragraph numbering attributes #define ATTR_PARANUMBERING_START ATTR_PACKNGO_MEDIUMSIZE + 1 diff --git a/sd/inc/sduiks.hrc b/sd/inc/sduiks.hrc index 6904cc2999d1..366c60629ae1 100644 --- a/sd/inc/sduiks.hrc +++ b/sd/inc/sduiks.hrc @@ -29,30 +29,6 @@ #include -#define SD_UIK_SHAPE_FACTORY UIK_DRAWING(00) -#define SD_UIK_POLYGON_FACTORY UIK_DRAWING(01) -#define SD_UIK_3D_SHAPE_FACTORY UIK_DRAWING(02) -#define SD_UIK_TEXT_FACTORY UIK_DRAWING(03) -#define SD_UIK_SNAP_FACTORY UIK_DRAWING(04) - -#define SD_UIK_DRAW_PAGES UIK_DRAWING(10) -#define SD_UIK_DRAW_PAGE_MANIPULATOR UIK_DRAWING(11) - -#define SD_UIK_SHAPE UIK_DRAWING(20) -#define SD_UIK_CONNECTOR UIK_DRAWING(21) -#define SD_UIK_CONNECTABLE UIK_DRAWING(22) -#define SD_UIK_SHAPE_3D UIK_DRAWING(23) -#define SD_UIK_SHAPE_GROUP UIK_DRAWING(24) -#define SD_UIK_SHAPE_MIRRORER UIK_DRAWING(25) -#define SD_UIK_SHAPE_ALIGNER UIK_DRAWING(26) -#define SD_UIK_SHAPE_ARRANGER UIK_DRAWING(27) -#define SD_UIK_SHAPE_CONVERTER UIK_DRAWING(28) -#define SD_UIK_ANIMATOR UIK_DRAWING(29) - -#define SD_UIK_DRAW_PAGE UIK_DRAWING(30) -#define SD_UIK_SHAPES UIK_DRAWING(31) -#define SD_UIK_GROUP UIK_DRAWING(32) -#define SD_UIK_COMBINE UIK_DRAWING(33) #define SD_UIK_CONNECT UIK_DRAWING(34) #define SD_UIK_CONNECT UIK_DRAWING(35) diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc index d5406ded8a26..d698f697bbe8 100644 --- a/sd/source/ui/animations/CustomAnimation.hrc +++ b/sd/source/ui/animations/CustomAnimation.hrc @@ -39,7 +39,6 @@ #define DLG_CUSTOMANIMATION_CREATE RID_CUSTOMANIMATION_START+2 #define DLG_SLIDE_TRANSITION_PANE RID_CUSTOMANIMATION_START+3 #define DLG_CUSTOMANIMATION_SCHEMES_PANE RID_CUSTOMANIMATION_START+4 -#define DLG_ANIMATION_SCHEMES_PANE RID_CUSTOMANIMATION_START+5 #define RID_EFFECT_CONTEXTMENU RID_CUSTOMANIMATION_START+0 #define RID_TP_CUSTOMANIMATION_EFFECT RID_CUSTOMANIMATION_START+1 diff --git a/sd/source/ui/animations/CustomAnimationDialog.hrc b/sd/source/ui/animations/CustomAnimationDialog.hrc index a7895543304b..544e5dfc8436 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hrc +++ b/sd/source/ui/animations/CustomAnimationDialog.hrc @@ -59,7 +59,6 @@ #define RB_STOP_ON_NEXT_SLIDE 28 #define RB_STOP_AFTER_N_SLIDES 29 #define MF_STOP_AFTER_SLIDES 30 -#define TP_CUSTOMANIMATION_EFFECT_COUNT 31 // TabPage RID_TP_CUSTOMANIMATION_DURATION #define FT_START 1 @@ -75,7 +74,6 @@ #define RB_CLICKSEQUENCE 11 #define RB_INTERACTIVE 12 #define LB_TRIGGER 13 -#define TP_CUSTOMANIMATION_DURATION_COUNT 13 // TabPage RID_TP_CUSTOMANIMATION_TEXT #define FT_GROUP_TEXT 1 @@ -84,6 +82,5 @@ #define MF_GROUP_AUTO 4 #define CBX_ANIMATE_FORM 5 #define CBX_REVERSE 6 -#define TP_CUSTOMANIMATION_TEXT_COUNT 6 #endif // _SD_CUSTOMANIMATIONDIALOG_HRC diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc index d2969f91be41..0edd168ad150 100644 --- a/sd/source/ui/annotations/annotations.hrc +++ b/sd/source/ui/annotations/annotations.hrc @@ -54,11 +54,7 @@ #define BTN_NEXT 3 #define BTN_PREV 4 -#define TBX_TOOLBAR 1 #define FT_AUTHOR 1 -#define ED_AUTHOR 2 -#define FT_DATE 3 -#define ED_DATE 4 #define CT_TEXT 5 diff --git a/sd/source/ui/inc/fontwork.hrc b/sd/source/ui/inc/fontwork.hrc index 0f7406cd8b7e..89b21f53cb63 100644 --- a/sd/source/ui/inc/fontwork.hrc +++ b/sd/source/ui/inc/fontwork.hrc @@ -24,22 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define GRP_STYLE 1 -#define BTN_STYLE_OFF 1 -#define BTN_STYLE_ROTATE 2 -#define BTN_STYLE_UPRIGHT 3 -#define BTN_STYLE_SLANTX 4 -#define BTN_STYLE_SLANTY 5 -#define CBX_MIRROR 1 #define MTR_FLD_DISTANCE 1 #define MTR_FLD_TEXTSTART 2 -#define BTN_POS_LEFT 6 -#define BTN_POS_CENTER 7 -#define BTN_POS_RIGHT 8 -#define BTN_POS_FULL 9 -#define GRP_POS 2 #define FT_DISTANCE 1 -#define FT_TEXTSTART 2 #define BTN_OK 1 #define BTN_CANCEL 1 #define BTN_HELP 1 diff --git a/sd/source/ui/inc/optdlg.hrc b/sd/source/ui/inc/optdlg.hrc index 6c50299c5ab2..6ee22cf6d935 100644 --- a/sd/source/ui/inc/optdlg.hrc +++ b/sd/source/ui/inc/optdlg.hrc @@ -24,8 +24,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TAB_DLG_IMPRESS_OPTIONS 842 -#define TAB_DLG_DRAW_OPTIONS 843 #define TP_GENERAL 1 #define TP_SAVE 2 diff --git a/sd/source/ui/inc/packgdlg.hrc b/sd/source/ui/inc/packgdlg.hrc index fe6546a7082b..4ce5cbf75a39 100644 --- a/sd/source/ui/inc/packgdlg.hrc +++ b/sd/source/ui/inc/packgdlg.hrc @@ -25,22 +25,7 @@ * ************************************************************************/ -#define DLG_PACKNGO 939 - #define BTN_OK 1 #define BTN_CANCEL 2 #define BTN_HELP 3 -#define GRP_DOKU 4 -#define CBX_UNLINK 5 -#define GRP_STORE 6 -#define GRP_SEPARATOR 7 -#define CBX_SPANNING 8 -#define LB_STOREMEDIUM 9 - -#define FT_DOKU_DESCR 10 -#define FT_STORE_DESCR 11 -#define FT_STOREMEDIUM 12 - -#define MTR_USERDEFINED 13 - diff --git a/sd/source/ui/inc/preview.hrc b/sd/source/ui/inc/preview.hrc index dd9f8756161a..c71c652e9cae 100644 --- a/sd/source/ui/inc/preview.hrc +++ b/sd/source/ui/inc/preview.hrc @@ -24,5 +24,4 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FLT_WIN_PREVIEW 783 #define CTL_PREVIEW 1 diff --git a/sd/source/ui/inc/prntopts.hrc b/sd/source/ui/inc/prntopts.hrc index 04d155f6730d..57a9aebf7d92 100644 --- a/sd/source/ui/inc/prntopts.hrc +++ b/sd/source/ui/inc/prntopts.hrc @@ -36,7 +36,6 @@ #define CBX_NOTES 7 #define CBX_HANDOUTS 8 #define CBX_OUTLINE 9 -#define GRP_WARNINGS 4 #define CBX_PAPERBIN 10 #define CBX_FRONT 12 #define CBX_BACK 13 @@ -45,7 +44,6 @@ #define RBT_PAGETILE 3 #define RBT_BOOKLET 4 #define GRP_PRINT_EXT 3 -#define GRP_PAPERBIN 4 #define RBT_COLOR 5 #define RBT_GRAYSCALE 6 diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 59b3aa439adc..ce85b79d408f 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -48,11 +48,6 @@ #define BMP_GRAPHIC RID_APP_START+53 // Bimaps fuer ValueSet im EffekteWindow -#define BMP_EFFECT_NONE RID_APP_START+105 -#define BMP_TEXTEFFECT_DISCARD_FROM_T RID_APP_START+106 -#define BMP_TEXTEFFECT_FADE_FROM_CENTER RID_APP_START+107 -#define BMP_EFFECT_HIDE RID_APP_START+108 -#define BMP_EFFECT_APPEAR RID_APP_START+109 // ----------------------------------------------------------------------------- diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index a3b36b9ec312..83ec16c14e84 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -42,23 +42,6 @@ * See also: res_bmp.hrc, popup.src */ -#define STR_DRAW_TEXTOBJ_POPUP (RID_APP_START+43) -#define STR_DRAW_GEOMOBJ_POPUP (RID_APP_START+44) -#define STR_DRAW_NOSEL_POPUP (RID_APP_START+45) -#define STR_SLIDETABLE_POPUP (RID_APP_START+46) -#define STR_BEZIER_POPUP (RID_APP_START+47) -#define STR_DRAW_LINEOBJ_POPUP (RID_APP_START+48) -#define STR_DRAW_MULTISELECTION_POPUP (RID_APP_START+49) -#define STR_PAGETAB_POPUP (RID_APP_START+50) -#define STR_LAYERTAB_POPUP (RID_APP_START+51) -#define STR_DRAW_GRAPHIC_POPUP (RID_APP_START+52) -#define STR_DRAW_OLE2_POPUP (RID_APP_START+53) -#define STR_DRAW_TEXTOBJ_INSIDE_POPUP (RID_APP_START+54) -#define STR_SLIDE_NOSEL_POPUP (RID_APP_START+55) -#define STR_OUTLINE_POPUP (RID_APP_START+56) -#define STR_MASTERPAGE_POPUP (RID_APP_START+57) -#define STR_DRAW_GROUPOBJ_POPUP (RID_APP_START+58) - #define STR_UNDO_CUT (RID_APP_START+59) #define STR_UNDO_DRAGDROP (RID_APP_START+66) #define STR_INSERTGRAPHIC (RID_APP_START+67) @@ -91,8 +74,6 @@ #define STR_UNDO_COLORRESOLUTION (RID_APP_START+89) /* keep 90 - 100 free for popup's */ -#define STR_DRAW_3DOBJ_POPUP (RID_APP_START+90) -#define STR_DRAW_MEASUREOBJ_POPUP (RID_APP_START+91) #define STR_ASK_DELETE_ALL_PICTURES (RID_APP_START+92) #define STR_WARN_PAGE_EXISTS (RID_APP_START+93) @@ -144,16 +125,13 @@ * configurations string should have identical ResourceID's!). */ -#define STR_PLUGIN_TOOLBOX RID_PLUGINTOOLBOX #define STR_DRAW_TOOLBOX RID_DRAW_TOOLBOX #define STR_SLIDE_TOOLBOX RID_SLIDE_TOOLBOX #define STR_DRAW_OBJ_TOOLBOX RID_DRAW_OBJ_TOOLBOX #define STR_SLIDE_OBJ_TOOLBOX RID_SLIDE_OBJ_TOOLBOX #define STR_BEZIER_TOOLBOX RID_BEZIER_TOOLBOX #define STR_DRAW_TEXT_TOOLBOX RID_DRAW_TEXT_TOOLBOX -#define STR_DRAW_TABLE_TOOLBOX RID_DRAW_TABLE_TOOLBOX #define STR_OUTLINE_TOOLBOX RID_OUTLINE_TOOLBOX -#define STR_DRAW_POLYLINEOBJ_POPUP RID_DRAW_POLYLINEOBJ_POPUP #define STR_GLUEPOINTS_TOOLBOX RID_GLUEPOINTS_TOOLBOX #define STR_DRAW_OPTIONS_TOOLBOX RID_DRAW_OPTIONS_TOOLBOX #define STR_DRAW_COMMONTASK_TOOLBOX RID_DRAW_COMMONTASK_TOOLBOX @@ -164,7 +142,6 @@ #define STR_GRAPHIC_TEXT_TOOLBOX RID_GRAPHIC_TEXT_TOOLBOX #define STR_DRAW_GRAF_TOOLBOX RID_DRAW_GRAF_TOOLBOX -#define STR_DRAW_MEDIA_TOOLBOX RID_DRAW_MEDIA_TOOLBOX // IDs fuer Praesentationsfolien #define STR_AUTOLAYOUT_NONE (RID_APP_START+210) @@ -284,11 +261,6 @@ * See also: res_bmp.hrc, popup.src */ -#define STR_DRAW_SNAPOBJECT_POPUP (RID_APP_START+390) -#define STR_DRAW_GLUEPOINT_POPUP (RID_APP_START+392) -#define STR_DRAW_CONTROL_POPUP (RID_APP_START+393) - - #define STR_EFFECT_NONE (RID_APP_START+400) @@ -327,7 +299,6 @@ #define STR_NEW_CUSTOMSHOW (RID_APP_START+512) #define STR_COPY_CUSTOMSHOW (RID_APP_START+513) -#define STR_VIEWTYPE_DUMMY (RID_APP_START+518) #define STR_BREAK_METAFILE (RID_APP_START+521) #define STR_BREAK_FAIL (RID_APP_START+522) @@ -389,63 +360,6 @@ #define STR_PAGE_BACKGROUND_TXT (RID_APP_START+583) #define STR_PAGE_BACKGROUND_TITLE (RID_APP_START+584) -// additional effects -#define STR_EFFECT_DISCARD_SHORT (RID_APP_START+598) - -#define STR_EFFECT_DISCARD_FROM_UL (RID_APP_START+600) -#define STR_EFFECT_DISCARD_FROM_UR (RID_APP_START+601) -#define STR_EFFECT_DISCARD_FROM_LR (RID_APP_START+602) -#define STR_EFFECT_DISCARD_FROM_LL (RID_APP_START+603) -#define STR_EFFECT_DISCARD_S_FROM_L (RID_APP_START+604) -#define STR_EFFECT_DISCARD_S_FROM_UL (RID_APP_START+605) -#define STR_EFFECT_DISCARD_S_FROM_T (RID_APP_START+606) -#define STR_EFFECT_DISCARD_S_FROM_UR (RID_APP_START+607) -#define STR_EFFECT_DISCARD_S_FROM_R (RID_APP_START+608) -#define STR_EFFECT_DISCARD_S_FROM_LR (RID_APP_START+609) -#define STR_EFFECT_DISCARD_S_FROM_B (RID_APP_START+610) -#define STR_EFFECT_DISCARD_S_FROM_LL (RID_APP_START+611) -#define STR_EFFECT_VERTICAL_CHECKERBOARD (RID_APP_START+612) -#define STR_EFFECT_HORIZONTAL_CHECKERBOARD (RID_APP_START+613) - -#define STR_EFFECT_MOVE_TO_UL (RID_APP_START+620) -#define STR_EFFECT_MOVE_TO_UR (RID_APP_START+621) -#define STR_EFFECT_MOVE_TO_LR (RID_APP_START+622) -#define STR_EFFECT_MOVE_TO_LL (RID_APP_START+623) -#define STR_EFFECT_MOVE_S_TO_L (RID_APP_START+625) -#define STR_EFFECT_MOVE_S_TO_UL (RID_APP_START+626) -#define STR_EFFECT_MOVE_S_TO_T (RID_APP_START+627) -#define STR_EFFECT_MOVE_S_TO_UR (RID_APP_START+628) -#define STR_EFFECT_MOVE_S_TO_R (RID_APP_START+629) -#define STR_EFFECT_MOVE_S_TO_LR (RID_APP_START+630) -#define STR_EFFECT_MOVE_S_TO_B (RID_APP_START+631) -#define STR_EFFECT_MOVE_S_TO_LL (RID_APP_START+632) - -#define STR_EFFECT_STRTCH (RID_APP_START+634) -#define STR_EFFECT_STRTCH_FROM_L (RID_APP_START+635) -#define STR_EFFECT_STRTCH_FROM_UL (RID_APP_START+636) -#define STR_EFFECT_STRTCH_FROM_T (RID_APP_START+637) -#define STR_EFFECT_STRTCH_FROM_UR (RID_APP_START+638) -#define STR_EFFECT_STRTCH_FROM_R (RID_APP_START+639) -#define STR_EFFECT_STRTCH_FROM_LR (RID_APP_START+640) -#define STR_EFFECT_STRTCH_FROM_B (RID_APP_START+641) -#define STR_EFFECT_STRTCH_FROM_LL (RID_APP_START+642) - -#define STR_EFFECT_STRTCH_ROTATE (RID_APP_START+643) -#define STR_EFFECT_STRTCH_HORIZONTAL (RID_APP_START+644) -#define STR_EFFECT_STRTCH_VERTICAL (RID_APP_START+645) -#define STR_EFFECT_ROTATE_HORIZONTAL (RID_APP_START+646) -#define STR_EFFECT_ROTATE_VERTICAL (RID_APP_START+647) - -#define STR_EFFECT_UNCOVER (RID_APP_START+650) -#define STR_EFFECT_UNCOVER_TO_L (RID_APP_START+651) -#define STR_EFFECT_UNCOVER_TO_UL (RID_APP_START+652) -#define STR_EFFECT_UNCOVER_TO_T (RID_APP_START+653) -#define STR_EFFECT_UNCOVER_TO_UR (RID_APP_START+654) -#define STR_EFFECT_UNCOVER_TO_R (RID_APP_START+655) -#define STR_EFFECT_UNCOVER_TO_LR (RID_APP_START+656) -#define STR_EFFECT_UNCOVER_TO_B (RID_APP_START+657) -#define STR_EFFECT_UNCOVER_TO_LL (RID_APP_START+658) - #define STR_TWAIN_NO_SOURCE (RID_APP_START+670) #define STR_UNDO_VECTORIZE (RID_APP_START+671) @@ -491,7 +405,6 @@ #define STR_TASKPANEL_NOT_AVAILABLE_SUBSTITUTION (RID_APP_START+711) #define STR_TASKPANEL_PREPARING_PREVIEW_SUBSTITUTION (RID_APP_START+712) #define STR_TASKPANEL_LAYOUT_MENU_TITLE (RID_APP_START+713) -#define STR_RESTORE_DRAW_MODE (RID_APP_START+714) #define STR_GRAPHICS_STYLE_FAMILY (RID_APP_START+715) #define STR_TITLE_SAVE_AS_PICTURE (RID_APP_START+716) diff --git a/sd/source/ui/inc/tpaction.hrc b/sd/source/ui/inc/tpaction.hrc index 0c4fe8a265d9..0b190b3c9597 100644 --- a/sd/source/ui/inc/tpaction.hrc +++ b/sd/source/ui/inc/tpaction.hrc @@ -31,20 +31,14 @@ #define LB_TREE_DOCUMENT 6 #define BTN_SEARCH 1 #define BTN_SEEK 2 -#define TSB_SOUND 1 -#define TSB_PLAY_FULL 2 #define FL_EFFECT 1 #define FL_SEPARATOR 2 -#define RBT_SLOW 1 -#define RBT_MEDIUM 2 -#define RBT_FAST 3 #define EDT_SOUND 1 #define EDT_BOOKMARK 2 #define EDT_DOCUMENT 3 #define EDT_PROGRAM 4 #define EDT_MACRO 5 #define FT_ACTION 2 -#define FT_ANIMATION 3 #define FT_SPEED 4 #define FT_TREE 5 #define TP_ANIMATION 787 diff --git a/sd/source/ui/inc/tpoption.hrc b/sd/source/ui/inc/tpoption.hrc index bcb5169d13f6..0077389e2ac5 100644 --- a/sd/source/ui/inc/tpoption.hrc +++ b/sd/source/ui/inc/tpoption.hrc @@ -28,7 +28,6 @@ #define TP_OPTIONS_CONTENTS 597 #define TP_OPTIONS_SNAP 598 #define TP_OPTIONS_MISC 599 -#define GRP_OTHER 1 #define FT_METRIC 2 #define GRP_PROGRAMSTART 3 #define GRP_DISPLAY 4 @@ -41,13 +40,10 @@ #define CBX_MOVE_OUTLINE 15 #define CBX_MARKED_HIT_MOVES_ALWAYS 19 #define CBX_CROOK_NO_CONTORTION 21 -#define CBX_SLANT_BUT_SHEAR 22 #define CBX_HANDLES_BEZIER 2 #define GRP_SNAP 1 #define GRP_ORTHO 2 #define FT_SNAP_AREA 1 -#define FI_ORTHO 2 -#define FI_SNAP 3 #define FT_BEZ_ANGLE 4 //#define FT_METRIC 5 #define LB_METRIC 1 @@ -60,12 +56,10 @@ #define CBX_BIGORTHO 7 #define CBX_SNAPGRID 1 #define CBX_SNAP_HELPLINES 2 -#define CBX_SNAP_GRID 1 #define CBX_SNAP_BORDER 3 #define CBX_SNAP_FRAME 4 #define CBX_SNAP_POINTS 5 #define CBX_START_WITH_TEMPLATE 6 -#define CBX_START_WITH_LAYOUT 7 #define CBX_PICKTHROUGH 9 #define CBX_QUICKEDIT 24 #define CBX_MASTERPAGE_CACHE 25 diff --git a/sd/source/ui/slideshow/slideshow.hrc b/sd/source/ui/slideshow/slideshow.hrc index f086f52cb73f..82c5c6509a76 100644 --- a/sd/source/ui/slideshow/slideshow.hrc +++ b/sd/source/ui/slideshow/slideshow.hrc @@ -48,8 +48,6 @@ #define CM_WIDTH_PEN_THICK 16 #define CM_WIDTH_PEN_VERY_THICK 17 #define CM_PEN_MODE 18 -#define CM_ERASE_MODE 19 -#define CM_POINTER_OPTION 20 #define CM_SLIDES 21 // this must be the last id! diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc index 35cbf6e1fc6f..1f3915efd43e 100644 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc @@ -53,354 +53,11 @@ #define SID_CHAOS_START 9000 #define SID_CHAOS_END 9799 -#define SID_BCC (SID_CHAOS_START + 2) -#define SID_CC (SID_CHAOS_START + 3) -#define SID_COMMENTS (SID_CHAOS_START + 4) -#define SID_DATE (SID_CHAOS_START + 5) -#define SID_IN_REPLY_TO (SID_CHAOS_START + 6) -#define SID_KEYWORDS (SID_CHAOS_START + 7) -#define SID_MESSAGE_ID (SID_CHAOS_START + 8) -#define SID_RECEIVED (SID_CHAOS_START + 9) -#define SID_REFERENCES (SID_CHAOS_START + 10) -#define SID_RETURN_PATH (SID_CHAOS_START + 11) -#define SID_SENDER (SID_CHAOS_START + 12) -#define SID_TO (SID_CHAOS_START + 13) -#define SID_NEWSGROUPS (SID_CHAOS_START + 14) -#define SID_MAILER (SID_CHAOS_START + 15) -#define SID_MIME_VERSION (SID_CHAOS_START + 16) -#define SID_CONTENT_DESCRIPTION (SID_CHAOS_START + 17) -#define SID_CONTENT_DISPOSITION (SID_CHAOS_START + 18) -#define SID_CONTENT_ID (SID_CHAOS_START + 19) -#define SID_CONTENT_TYPE (SID_CHAOS_START + 20) -#define SID_IS_CONTAINER (SID_CHAOS_START + 21) -#define SID_IS_MESSAGE (SID_CHAOS_START + 22) -#define SID_IS_MULTIPART (SID_CHAOS_START + 23) -#define SID_APPROVED (SID_CHAOS_START + 24) -#define SID_CONTROL (SID_CHAOS_START + 25) #define SID_DISTRIBUTION (SID_CHAOS_START + 26) -#define SID_EXPIRES (SID_CHAOS_START + 27) -#define SID_FOLLOWUPTO (SID_CHAOS_START + 28) -#define SID_LINES (SID_CHAOS_START + 29) -#define SID_DOCUMENT_BYTESIZE (SID_CHAOS_START + 30) -#define SID_MESSAGE_BYTESIZE (SID_CHAOS_START + 31) -#define SID_ORGANIZATION (SID_CHAOS_START + 32) -#define SID_SUMMARY (SID_CHAOS_START + 33) -#define SID_XREF (SID_CHAOS_START + 34) -#define SID_NEWSREADER (SID_CHAOS_START + 35) -#define SID_SEND_DATETIME (SID_CHAOS_START + 36) -#define SID_RETURN_RECEIPT (SID_CHAOS_START + 37) -#define SID_PRIORITY (SID_CHAOS_START + 38) -#define SID_SENT_TO (SID_CHAOS_START + 39) -#define SID_RECEIVED_BY (SID_CHAOS_START + 40) -#define SID_FLAG_DELETED (SID_CHAOS_START + 41) -#define SID_IS_FOLDER (SID_CHAOS_START + 42) -#define SID_FLAG_GETBODY (SID_CHAOS_START + 43) -#define SID_FLAG_KEEP (SID_CHAOS_START + 44) -#define SID_FLAG_FLAGGED (SID_CHAOS_START + 45) -#define SID_FLAG_ANSWERED (SID_CHAOS_START + 46) -#define SID_FLAG_RECENT (SID_CHAOS_START + 47) -#define SID_FLAG_SEEN (SID_CHAOS_START + 48) -#define SID_TOTALCONTENTCOUNT (SID_CHAOS_START + 49) -#define SID_SEENCONTENTCOUNT (SID_CHAOS_START + 50) -#define SID_RULES (SID_CHAOS_START + 51) -#define SID_SORTCRITERIA (SID_CHAOS_START + 52) -#define SID_THREADED (SID_CHAOS_START + 53) -//#define DEFAULT_CONTENT_THREAD_MASTER (SID_CHAOS_START + 54) -//#define DEFAULT_CONTENT_THREAD_SLAVE (SID_CHAOS_START + 55) -#define SID_AUTOUPDATE_MODE (SID_CHAOS_START + 56) -#define SID_AUTOUPDATE_INTERVAL (SID_CHAOS_START + 57) -#define SID_AUTOUPDATE_CONFIRMATION (SID_CHAOS_START + 58) -#define SID_UPDATE_MAXMESSAGECOUNT (SID_CHAOS_START + 59) -#define SID_UPDATE_MAXMESSAGESIZE (SID_CHAOS_START + 60) -#define SID_REMOVEFROMSERVER_MODE (SID_CHAOS_START + 61) -#define SID_REMOVEFROMSERVER_DELAY (SID_CHAOS_START + 62) -#define SID_EXPIRATION_MODE (SID_CHAOS_START + 63) -#define SID_EXPIRATION_TIME (SID_CHAOS_START + 64) -#define SID_EXPIRATION_MAXCOUNT (SID_CHAOS_START + 65) -#define SID_DELETE_CONFIRMATION (SID_CHAOS_START + 66) -#define SID_FLAG_SUBSCRIBED (SID_CHAOS_START + 67) -#define SID_SERVERPORT (SID_CHAOS_START + 68) -#define SID_MAILSEND_SERVERNAME (SID_CHAOS_START + 69) -#define SID_MAILSEND_USERNAME (SID_CHAOS_START + 70) -#define SID_MAILSEND_PASSWORD (SID_CHAOS_START + 71) -#define SID_NEWSSEND_SERVERNAME (SID_CHAOS_START + 72) -#define SID_NEWSSEND_USERNAME (SID_CHAOS_START + 73) -#define SID_NEWSSEND_PASSWORD (SID_CHAOS_START + 74) -#define SID_RECEIVE_SERVERNAME (SID_CHAOS_START + 75) -#define SID_RECEIVE_USERNAME (SID_CHAOS_START + 76) -#define SID_RECEIVE_PASSWORD (SID_CHAOS_START + 77) -#define SID_FLAG_SUPPORTMODE (SID_CHAOS_START + 78) -#define SID_OWN_URL (SID_CHAOS_START + 81) -#define SID_INTERIM_URL (SID_CHAOS_START + 82) -#define SID_REFERED_URL (SID_CHAOS_START + 83) -#define SID_FROM (SID_CHAOS_START + 84) -#define SID_REPLY_TO (SID_CHAOS_START + 85) #define SID_UPDATE (SID_CHAOS_START + 86) -#define SID_UPDATE_FROMSERVER (SID_CHAOS_START + 87) -#define SID_UPDATE_TOSERVER (SID_CHAOS_START + 88) -#define SID_CREATE_NEW (SID_CHAOS_START + 89) #define SID_INSERT (SID_CHAOS_START + 90) -#define SID_SEND_AGAIN (SID_CHAOS_START + 91) -#define SID_REPLY (SID_CHAOS_START + 92) -#define SID_FOLLOWUP (SID_CHAOS_START + 93) -#define SID_FORWARD (SID_CHAOS_START + 94) -#define SID_REPLY_AND_FOLLOWUP (SID_CHAOS_START + 95) -#define SID_DATE_CREATED (SID_CHAOS_START + 96) -#define SID_DATE_MODIFIED (SID_CHAOS_START + 97) -#define SID_NEWSGROUPCOUNT (SID_CHAOS_START + 98) -#define SID_SUBSCRNEWSGROUPCOUNT (SID_CHAOS_START + 99) -#define SID_ARTICLECOUNT (SID_CHAOS_START + 100) -#define SID_UNREAD_ARTICLECOUNT (SID_CHAOS_START + 101) -#define SID_FLAG_READONLY (SID_CHAOS_START + 102) -#define SID_RECIPIENTLIST (SID_CHAOS_START + 103) -#define SID_OPEN_CNT (SID_CHAOS_START + 104) -#define SID_MESSAGEBODY (SID_CHAOS_START + 105) -#define SID_MSG_COLUMN_INFO (SID_CHAOS_START + 106) -#define SID_FLD_COLUMN_INFO (SID_CHAOS_START + 107) -#define SID_VIEW_DESCRIPTION (SID_CHAOS_START + 108) -#define SID_NEWS_GROUPLIST (SID_CHAOS_START + 109) -#define SID_REAL_URL (SID_CHAOS_START + 110) -#define SID_CHAOS_SERVERBASE (SID_CHAOS_START + 111) -#define SID_FOLDERVIEW_MODE (SID_CHAOS_START + 112) -#define SID_MESSAGEVIEW_MODE (SID_CHAOS_START + 113) -#define SID_SENTMESSAGEVIEW_MODE (SID_CHAOS_START + 114) -#define SID_DELETE_ON_SERVER (SID_CHAOS_START + 115) -#define SID_FILTERED (SID_CHAOS_START + 116) -#define SID_MESSAGE_STOREMODE (SID_CHAOS_START + 117) -#define SID_UNDELETE (SID_CHAOS_START + 118) -#define SID_CLOSECNT (SID_CHAOS_START + 119) -#define SID_REOPEN (SID_CHAOS_START + 120) -#define SID_NEW_CNT_CONTENT (SID_CHAOS_START + 121) -#define SID_CNT_IMPORT (SID_CHAOS_START + 122) -#define SID_CNT_DELETE (SID_CHAOS_START + 123) -#define SID_CNT_RENAME (SID_CHAOS_START + 124) -#define SID_CNT_SHOW (SID_CHAOS_START + 125) -#define SID_CNT_SHOW_THREADED (SID_CHAOS_START + 126) -#define SID_CNT_SHOW_FILTERED (SID_CHAOS_START + 127) -#define SID_CNT_ACTUALIZE (SID_CHAOS_START + 128) -#define SID_CNT_RESEND_MSG (SID_CHAOS_START + 129) -#define SID_MARK_THREAD_READ (SID_CHAOS_START + 130) -#define SID_MARK_THREAD_UNREAD (SID_CHAOS_START + 131) -#define SID_KILL_THREAD (SID_CHAOS_START + 132) -#define SID_KILL_AUTHOR (SID_CHAOS_START + 133) -#define SID_KILL_SUBJECT (SID_CHAOS_START + 134) -#define SID_CNT_IS_READ (SID_CHAOS_START + 135) -#define SID_CNT_IS_MARKED (SID_CHAOS_START + 136) -#define SID_CNT_IS_SUBSCRIBED (SID_CHAOS_START + 137) -#define SID_CNT_PROPERTIES (SID_CHAOS_START + 138) -#define SID_CNT_RESTORE (SID_CHAOS_START + 139) -#define SID_UPDATE_ENABLED (SID_CHAOS_START + 140) -#define SID_SHOW_MSGS_HAS_TIMELIMIT (SID_CHAOS_START + 141) -#define SID_SHOW_MSGS_TIMELIMIT (SID_CHAOS_START + 142) -#ifndef _CHAOS_RESOURCE -#define SID_STORE_MSGS_HAS_TIMELIMIT (SID_CHAOS_START + 143) -#define SID_STORE_MSGS_TIMELIMIT (SID_CHAOS_START + 144) -#endif -#define SID_CNT_DEFAULT (SID_CHAOS_START + 145) -#define SID_CNT_SYNCHRONIZE (SID_CHAOS_START + 146) -#define SID_SEND_SERVERNAME (SID_CHAOS_START + 147) -#define SID_SEND_USERNAME (SID_CHAOS_START + 148) -#define SID_SEND_PASSWORD (SID_CHAOS_START + 149) -#define SID_SEND_REPLY_TO_DEFAULT (SID_CHAOS_START + 150) -#define SID_SEND_FROM_DEFAULT (SID_CHAOS_START + 151) -#define SID_SEND_PUBLIC_PROT_ID (SID_CHAOS_START + 152) -#define SID_SEND_PRIVATE_PROT_ID (SID_CHAOS_START + 153) -#define SID_SEND_PUBLIC_OUTBOXPROPS (SID_CHAOS_START + 154) -#define SID_SEND_PRIVATE_OUTBOXPROPS (SID_CHAOS_START + 155) -#define SID_VIM_POPATH (SID_CHAOS_START + 156) -#define SID_SEND_VIM_POPATH (SID_CHAOS_START + 157) -#define SID_SEARCH_CRITERIA (SID_CHAOS_START + 158) -#define SID_SEARCH_LOCATIONS (SID_CHAOS_START + 159) -#define SID_SEARCH_RECURSIVE (SID_CHAOS_START + 160) -#define SID_SEARCH_FOLDER_VIEW (SID_CHAOS_START + 161) -#define SID_SEARCH_DOCUMENT_VIEW (SID_CHAOS_START + 162) -#define SID_TRASHCAN_EMPTY_TRASH (SID_CHAOS_START + 163) -#define SID_TRASHCAN_FLAG_AUTODELETE (SID_CHAOS_START + 164) -#define SID_TRASHCAN_FLAG_CONFIRMEMPTY (SID_CHAOS_START + 165) -#define SID_TRASH_RESTORE (SID_CHAOS_START + 166) -#define SID_CNT_EXPORT (SID_CHAOS_START + 167) -#define SID_EXPLORER_CREATEPOP3ACCOUNT (SID_CHAOS_START + 168) -#define SID_EXPLORER_CREATEIMAPACCOUNT (SID_CHAOS_START + 169) -#define SID_EXPLORER_CREATENEWS (SID_CHAOS_START + 170) -#define SID_EXPLORER_CREATEOUTTRAY (SID_CHAOS_START + 171) -#define SID_EXPLORER_CREATEFTPACCOUNT (SID_CHAOS_START + 172) -#define SID_EXPLORER_CREATEVIMACCOUNT (SID_CHAOS_START + 173) -#define SID_EXPLORER_CREATEPROPERTYSETFOLDER (SID_CHAOS_START + 174) -#define SID_EXPLORER_CREATEFSYS (SID_CHAOS_START + 175) #define SID_EXPLORER_CREATEPROJECT (SID_CHAOS_START + 176) -#define SID_EXPLORER_CREATESEARCHFOLDER (SID_CHAOS_START + 177) -#define SID_EXPLORER_CREATECHANNEL_SUBSCRIBE_BOX (SID_CHAOS_START + 178) -#define SID_EXPLORER_CREATECHANNEL_BMK (SID_CHAOS_START + 179) -#define SID_WHO_IS_MASTER (SID_CHAOS_START + 180) -#define SID_FSYS_KIND (SID_CHAOS_START + 181) -#define SID_FSYS_FLAGS (SID_CHAOS_START + 182) -#define SID_EXPLORER_CREATETRASHCAN (SID_CHAOS_START + 183) -#define SID_DOCUMENT_HEADER (SID_CHAOS_START + 184) #define SID_VIEW_FLD_PIC (SID_CHAOS_START + 185) -#define SID_FSYS_VALUE_FOLDER (SID_CHAOS_START + 186) -#define SID_FOLDER_COUNT (SID_CHAOS_START + 187) -#define SID_PURGE (SID_CHAOS_START + 188) -#define SID_FSYS_SHOW_HIDDEN (SID_CHAOS_START + 189) -#define SID_CNT_SET_AS_DEFAULT (SID_CHAOS_START + 190) -#define SID_FLAG_UPDATE_ON_OPEN (SID_CHAOS_START + 191) -#define SID_ATTR_FONT (SID_CHAOS_START + 192) -#define SID_VALUE_ADDED_MODE (SID_CHAOS_START + 193) -#define SID_STORE_MARKED (SID_CHAOS_START + 194) -#define SID_SEND_COPY_TARGET (SID_CHAOS_START + 195) - -// ERRCODE's ----------------------------------------------------------------- - -#define ERRCODE_CHAOS_LOGIN_FAILURE_RECEIVE (ERRCODE_AREA_CHAOS) -#define ERRCODE_CHAOS_LOGINFAIL_NOEXCH (ERRCODE_AREA_CHAOS + 1) -#define ERRCODE_CHAOS_LOGINFAIL_ACCOUNT_NOEXCH (ERRCODE_AREA_CHAOS + 2) -#define ERRCODE_CHAOS_CONNECT_FAILURE (ERRCODE_AREA_CHAOS + 3) -#define ERRCODE_CHAOS_OFFLINE (ERRCODE_AREA_CHAOS + 4) -#define ERRCODE_CHAOS_SERVER_ERROR (ERRCODE_AREA_CHAOS + 5) -#define ERRCODE_CHAOS_IMAP_BAD_RESPONSE (ERRCODE_AREA_CHAOS + 6) - -#define ERRCODE_CHAOS_WRONG_FILE_FORMAT (ERRCODE_AREA_CHAOS + 8) - -#define ERRCODE_CHAOS_CNTOUT_NO_FROM (ERRCODE_AREA_CHAOS + 10) -#define ERRCODE_CHAOS_TO_MANY_GROUPS (ERRCODE_AREA_CHAOS + 11) -#define ERRCODE_CHAOS_DELETE_ABORTED (ERRCODE_AREA_CHAOS + 12) -#define ERRCODE_CHAOS_QUERY_DELETE (ERRCODE_AREA_CHAOS + 13) -#define ERRCODE_CHAOS_NOTAVAILABLE (ERRCODE_AREA_CHAOS + 14) -#define ERRCODE_CHAOS_VIM_LIBRARY_ERROR (ERRCODE_AREA_CHAOS + 15) -#define ERRCODE_CHAOS_FOLDER_INVALID (ERRCODE_AREA_CHAOS + 16) -#define ERRCODE_CHAOS_FTP_RESOLVERERROR (ERRCODE_AREA_CHAOS + 17) -#define ERRCODE_CHAOS_FTP_NETWORKERROR (ERRCODE_AREA_CHAOS + 18) - -#define ERRCODE_CHAOS_NO_VIM_LIBRARY (ERRCODE_AREA_CHAOS + 23) -#define ERRCODE_CHAOS_VIM_LIBRARY_CORRUPTED (ERRCODE_AREA_CHAOS + 24) -#define ERRCODE_CHAOS_CCMAIL_EXPORT_ERROR (ERRCODE_AREA_CHAOS + 25) -#define ERRCODE_CHAOS_NO_CCMAIL_EXPORT_FILE (ERRCODE_AREA_CHAOS + 26) -#define ERRCODE_CHAOS_ILLEGAL_CCMAIL_EXPORT_FILE (ERRCODE_AREA_CHAOS + 27) -#define ERRCODE_CHAOS_MESSAGE_NOT_FOUND (ERRCODE_AREA_CHAOS + 28) -#define ERRCODE_CHAOS_BAD_CCMAIL_EXPORT_PASSWORD (ERRCODE_AREA_CHAOS + 29) -#define ERRCODE_CHAOS_CCMAIL_EXPORT_TOO_LONG (ERRCODE_AREA_CHAOS + 30) -#define ERRCODE_CHAOS_FOLDER_EXIST (ERRCODE_AREA_CHAOS + 31) -#define ERRCODE_CHAOS_FOLDER_NOT_EXIST (ERRCODE_AREA_CHAOS + 32) -#define ERRCODE_CHAOS_NO_VIM_BBOARDLIST (ERRCODE_AREA_CHAOS + 33) -#define ERRCODE_CHAOS_ILLEGAL_MESSAGE_ID (ERRCODE_AREA_CHAOS + 34) -#define ERRCODE_CHAOS_SERVER_PORT_SYNTAX (ERRCODE_AREA_CHAOS + 35) -#define ERRCODE_CHAOS_SERVERNAME_SYNTAX (ERRCODE_AREA_CHAOS + 36) -#define ERRCODE_CHAOS_USERNAME_SYNTAX (ERRCODE_AREA_CHAOS + 37) -#define ERRCODE_CHAOS_IS_RESCHEDULED (ERRCODE_AREA_CHAOS + 38) -#define ERRCODE_CHAOS_VIM_NO_FAKE_MESSAGE_ID (ERRCODE_AREA_CHAOS + 39) -#define ERRCODE_CHAOS_FSYS_ROOT_DELETE (ERRCODE_AREA_CHAOS + 40) -#define ERRCODE_CHAOS_FILE_EXIST (ERRCODE_AREA_CHAOS + 41) -#define ERRCODE_CHAOS_FILE_NOT_EXIST (ERRCODE_AREA_CHAOS + 42) -#define ERRCODE_CHAOS_FSYS_MISPLACED_CHAR (ERRCODE_AREA_CHAOS + 43) -#define ERRCODE_CHAOS_FSYS_INVALID_CHAR (ERRCODE_AREA_CHAOS + 44) -#define ERRCODE_CHAOS_FSYS_INVALID_DEVICE (ERRCODE_AREA_CHAOS + 45) -#define ERRCODE_CHAOS_FSYS_ACCESS_DENIED (ERRCODE_AREA_CHAOS + 46) -#define ERRCODE_CHAOS_FSYS_LOCK_VIOLATION (ERRCODE_AREA_CHAOS + 47) -#define ERRCODE_CHAOS_FSYS_VOLUME_FULL (ERRCODE_AREA_CHAOS + 48) -#define ERRCODE_CHAOS_FSYS_NOT_SUPPORTED (ERRCODE_AREA_CHAOS + 49) -#define ERRCODE_CHAOS_FSYS_UNKNOWN (ERRCODE_AREA_CHAOS + 50) -#define ERRCODE_CHAOS_FSYS_NOT_A_FILE (ERRCODE_AREA_CHAOS + 51) -#define ERRCODE_CHAOS_FSYS_NOT_A_DIRECTORY (ERRCODE_AREA_CHAOS + 52) -#define ERRCODE_CHAOS_FSYS_IS_WILDCARD (ERRCODE_AREA_CHAOS + 53) - -#define ERRCODE_CHAOS_FSYS_UPDATE_NEEDED (ERRCODE_AREA_CHAOS + 55) -#define ERRCODE_CHAOS_FSYS_CANT_RESOLVE_CONFLICT (ERRCODE_AREA_CHAOS + 56) - -#define ERRCODE_CHAOS_ONE_NOT_SEARCHABLE (ERRCODE_AREA_CHAOS + 58) -#define ERRCODE_CHAOS_MULTIPLE_NOT_SEARCHABLE (ERRCODE_AREA_CHAOS + 59) -#define ERRCODE_CHAOS_FSYS_CACHE_INCONSISTENT (ERRCODE_AREA_CHAOS + 60) -#define ERRCODE_CHAOS_FSYS_READONLY (ERRCODE_AREA_CHAOS + 61) -#define ERRCODE_CHAOS_FSYS_LOCK (ERRCODE_AREA_CHAOS + 62) -#define ERRCODE_CHAOS_FSYS_UNLOCK (ERRCODE_AREA_CHAOS + 63) -#define ERRCODE_CHAOS_FSYS_DELETE (ERRCODE_AREA_CHAOS + 64) -#define ERRCODE_CHAOS_FSYS_IS_MARKED (ERRCODE_AREA_CHAOS + 65) -#define ERRCODE_CHAOS_FTP_GENERAL_FAILURE (ERRCODE_AREA_CHAOS + 66) -#define ERRCODE_CHAOS_DO_LOG (ERRCODE_AREA_CHAOS + 67) -#define ERRCODE_CHAOS_HTTP_COOKIE_REQUEST (ERRCODE_AREA_CHAOS + 68) -#define ERRCODE_CHAOS_FSYS_LOST_ROOT (ERRCODE_AREA_CHAOS + 69) -#define ERRCODE_CHAOS_FTP_PROXY (ERRCODE_AREA_CHAOS + 70) -#define ERRCODE_CHAOS_SOURCE_EQ_TARGET (ERRCODE_AREA_CHAOS + 71) -#define ERRCODE_CHAOS_CONFIRM_EMPTY_TRASH (ERRCODE_AREA_CHAOS + 72) -#define ERRCODE_CHAOS_FSYS_NO_TARGET (ERRCODE_AREA_CHAOS + 73) -#define ERRCODE_CHAOS_FSYS_RECURSIVE (ERRCODE_AREA_CHAOS + 74) -#define ERRCODE_CHAOS_FSYS_INSERT_MEDIUM (ERRCODE_AREA_CHAOS + 75) -#define ERRCODE_CHAOS_NO_DOCINFO (ERRCODE_AREA_CHAOS + 76) -#define ERRCODE_CHAOS_CCMAIL_EXPORT_NOT_TERMINATING (ERRCODE_AREA_CHAOS + 77) -#define ERRCODE_CHAOS_EXTERNAL_COMMAND_FAILED (ERRCODE_AREA_CHAOS + 78) -#define ERRCODE_CHAOS_RENAME_FAILED (ERRCODE_AREA_CHAOS + 79) -#define ERRCODE_CHAOS_NOT_HANDLED (ERRCODE_AREA_CHAOS + 80) -#define ERRCODE_CHAOS_COULD_NOT_INIT_CMP (ERRCODE_AREA_CHAOS + 81) -#define ERRCODE_CHAOS_TRANSFER_URL_NOT_SUPPORTED (ERRCODE_AREA_CHAOS + 82) -#define ERRCODE_CHAOS_EMPTY_SERVERNAME (ERRCODE_AREA_CHAOS + 83) -#define ERRCODE_CHAOS_EMPTY_USERNAME (ERRCODE_AREA_CHAOS + 84) -#define ERRCODE_CHAOS_BAD_INET (ERRCODE_AREA_CHAOS + 85) -#define ERRCODE_CHAOS_IMAP_SERVER_MSG (ERRCODE_AREA_CHAOS + 86) -#define ERRCODE_CHAOS_IMAP_CONNECTION_CLOSED (ERRCODE_AREA_CHAOS + 87) -#define ERRCODE_CHAOS_IMAP_NOT_IMAP4 (ERRCODE_AREA_CHAOS + 88) -#define ERRCODE_CHAOS_IMAP_BAD_SERVER (ERRCODE_AREA_CHAOS + 89) -#define ERRCODE_CHAOS_REORGANIZE_FILE_LOCKED (ERRCODE_AREA_CHAOS + 90) -#define ERRCODE_CHAOS_IMAP_BAD_TITLE (ERRCODE_AREA_CHAOS + 91) -#define ERRCODE_CHAOS_SERVER_CONNECT_FAILURE (ERRCODE_AREA_CHAOS + 92) -#define ERRCODE_CHAOS_PASSWORD_SYNTAX (ERRCODE_AREA_CHAOS + 93) -#define ERRCODE_CHAOS_QUERY_DELETE_CACHE (ERRCODE_AREA_CHAOS + 94) -#define ERRCODE_CHAOS_REORGANIZE_NO_DISKSPACE (ERRCODE_AREA_CHAOS + 95) -#define ERRCODE_CHAOS_LOGIN_FAILURE_ACCOUNT (ERRCODE_AREA_CHAOS + 96) -#define ERRCODE_CHAOS_ACCOUNT_SYNTAX (ERRCODE_AREA_CHAOS + 97) -#define ERRCODE_CHAOS_CHANNEL_TERMINATION (ERRCODE_AREA_CHAOS + 98) - -// Tabpage-Ids --------------------------------------------------------------- - -#define CNT_TABPAGE_GENERAL 1 -#define CNT_TABPAGE_SERVER_SETTINGS 2 -#define CNT_TABPAGE_RULES 3 -#define CNT_TABPAGE_VIEW_PROPERTIES 4 -#define CNT_TABPAGE_CONTENT_PROPERTIES 5 -#define CNT_TABPAGE_SUBSCRIBE 6 -#define CNT_TABPAGE_RECIPIENT_STATE 7 -#define CNT_TABPAGE_RECV_POP3 8 -#define CNT_TABPAGE_RECV_NNTP 9 -#define CNT_TABPAGE_RECV_IMAP 10 -#define CNT_TABPAGE_RECV_VIM 11 -#define CNT_TABPAGE_SEND_SMTP 12 -#define CNT_TABPAGE_SEND_NNTP 13 -#define CNT_TABPAGE_SEND_VIM 14 -#define CNT_TABPAGE_MAIL_NEWS_SEND 15 -#define CNT_TABPAGE_SEARCH_CRITERIA 16 -#define CNT_TABPAGE_SEARCH_LOCATIONS 17 -#define CNT_TABPAGE_PROJECT_DATAEXCHANGE 18 -#define CNT_TABPAGE_SBOX_LOCATION 19 -#define CNT_TABPAGE_SBOX_SUBSCRIBTION 20 -#define CNT_TABPAGE_SBOX_SCHEDULE 21 -#define CNT_TABPAGE_FTP_SERVER 22 -#define CNT_TABPAGE_TRASHCAN_OPTIONS 23 -#define CNT_TABPAGE_BMK 24 -#define CNT_TABPAGE_SBOX_NOTIFICATION 25 -#define CNT_TABPAGE_SBOX_SDC_GENERAL 26 -#define CNT_TABPAGE_SBOX_CDF_SUBSCRIBTION 27 -#define CNT_TABPAGE_BACKGROUND 28 -#define CNT_TABPAGE_HEADER 29 -#define CNT_TABPAGE_DESCRIPTION 30 -#define CNT_TABPAGE_FONT 31 -#define CNT_TABPAGE_FOLDER_BMK 32 -#define CNT_TABPAGE_DOCUMENT_BMK 33 -#define CNT_TABPAGE_WEBVIEW 34 - - -#define DEF_WIDTH_FROM 150 -#define DEF_WIDTH_TITLE_MAIL 300 -#define DEF_WIDTH_IS_MARKED 60 -#define DEF_WIDTH_IS_READ 60 -#define DEF_WIDTH_DATE_CREATED 100 -#define DEF_WIDTH_PRIORITY 30 -#define DEF_WIDTH_DOCUMENT_SIZE 90 -#define DEF_WIDTH_RECIPIENTLIST 150 -#define DEF_WIDTH_TITLE_FSYS 150 -#define DEF_WIDTH_TITLE_SUBSCRIBE 230 -#define DEF_WIDTH_SUBSCRIBE_CRAWL_STATUS 180 -#define DEF_WIDTH_SUBSCRIBE_NEXT_UPD 120 -#define DEF_WIDTH_SUBSCRIBE_TARGET_URL 190 -#define DEF_WIDTH_CONTENT_TYPE 100 -#define DEF_WIDTH_TRASH_ORIGIN 150 - // ----- Help IDs ----- diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index 48e44b216792..035ea4ea3e61 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -43,13 +43,13 @@ //-------------------------------------------------------------------- #define EVENT_SFX_START 5000 -#define EVENT_SFX_END 9999 +// EVENT_SFX_END 9999 -#define EVENT_LIB_START 10000 -#define EVENT_LIB_END 19999 +// EVENT_LIB_START 10000 +// EVENT_LIB_END 19999 #define EVENT_APP_START 20000 -#define EVENT_APP_END 29999 +// EVENT_APP_END 29999 #define EVENT_OBJ_START 30000 #define EVENT_OBJ0_START (EVENT_OBJ_START+0x0000) @@ -57,19 +57,10 @@ #define EVENT_OBJ1_START (EVENT_OBJ_START+0x0200) #define EVENT_OBJ3_START (EVENT_OBJ_START+0x0300) #define EVENT_OBJ4_START (EVENT_OBJ_START+0x0400) -#define EVENT_OBJ5_START (EVENT_OBJ_START+0x0500) -#define EVENT_OBJ6_START (EVENT_OBJ_START+0x0600) -#define EVENT_OBJ7_START (EVENT_OBJ_START+0x0700) -#define EVENT_OBJ_END 31999 - -#define EVENT_SIM_START EVENT_OBJ0_START -#define EVENT_SCH_START EVENT_OBJ1_START -#define EVENT_SMA_START EVENT_OBJ2_START -#define EVENT_SGA_START EVENT_OBJ3_START + #define EVENT_SVX_START EVENT_OBJ4_START // Warning: the following are simultaneously SID_ON_ ... -#define SFX_EVENT_STARTAPP (EVENT_SFX_START) #define SFX_EVENT_CLOSEAPP (EVENT_SFX_START + 1) #define SFX_EVENT_CREATEDOC (EVENT_SFX_START + 2) #define SFX_EVENT_OPENDOC (EVENT_SFX_START + 3) @@ -78,15 +69,11 @@ #define SFX_EVENT_SAVEASDOC (EVENT_SFX_START + 6) #define SFX_EVENT_ACTIVATEDOC (EVENT_SFX_START + 7) #define SFX_EVENT_DEACTIVATEDOC (EVENT_SFX_START + 8) -#define SFX_EVENT_PRINTDOC (EVENT_SFX_START + 9) -#define SFX_EVENT_ONERROR (EVENT_SFX_START + 10) #define SFX_EVENT_LOADFINISHED (EVENT_SFX_START + 11) -#define SFX_EVENT_SAVEFINISHED (EVENT_SFX_START + 12) #define SFX_EVENT_MODIFYCHANGED (EVENT_SFX_START + 13) #define SFX_EVENT_PREPARECLOSEDOC (EVENT_SFX_START + 14) -#define SFX_EVENT_NEWMESSAGE (EVENT_SFX_START + 15) #define SFX_EVENT_TOGGLEFULLSCREENMODE (EVENT_SFX_START + 16) #define SFX_EVENT_SAVEDOCDONE (EVENT_SFX_START + 17) #define SFX_EVENT_SAVEASDOCDONE (EVENT_SFX_START + 18) @@ -107,8 +94,6 @@ #define SFX_EVENT_SAVEDOCFAILED (EVENT_SFX_START + 28) #define SFX_EVENT_SAVETODOCFAILED (EVENT_SFX_START + 29) -#define SFX_EVENT_TITLECHANGED (EVENT_SFX_START + 30) -#define SFX_EVENT_MODECHANGED (EVENT_SFX_START + 31) // Events for Controls etc. #define SFX_EVENT_MOUSEOVER_OBJECT ( EVENT_SFX_START + 100 ) @@ -136,17 +121,9 @@ //-------------------------------------------------------------------- -#define SFX_MSG_NAME 1 -#define SFX_MSG_HELPTEXT 2 -#define SFX_MSG_BASICNAME 3 #define SFX_MSG_ENABLEDBMP 1 #define SFX_MSG_DISABLEDBMP 2 -#define SFX_MSG_ENABLEDSMALLBMP SFX_MSG_ENABLEDBMP -#define SFX_MSG_DISABLEDSMALLBMP SFX_MSG_DISABLEDBMP -#define SFX_MSG_ENABLEDLARGEBMP 3 -#define SFX_MSG_DISABLEDLARGEBMP 4 -#define SFX_MSG_MONO 10 #define SFX_OBJECTBAR_APPLICATION 0 #define SFX_OBJECTBAR_OBJECT 1 @@ -156,20 +133,11 @@ #define SFX_OBJECTBAR_RECORDING 5 #define SFX_OBJECTBAR_COMMONTASK 6 #define SFX_OBJECTBAR_OPTIONS 7 -#define SFX_OBJECTBAR_USERDEF1 8 -#define SFX_OBJECTBAR_USERDEF2 9 -#define SFX_OBJECTBAR_USERDEF3 10 -#define SFX_OBJECTBAR_USERDEF4 11 #define SFX_OBJECTBAR_NAVIGATION 12 #define SFX_OBJECTBAR_MAX 13 // temporary due to compatibility -#define SFX_OBJECTBAR_IDE 2 -#define SFX_OBJECTBAR_FRAME 3 -#define SFX_OBJECTBAR_DOCUMENT 4 -#define SFX_OBJECTBAR_VIEW 5 -#define SFX_OBJECTBAR_SELECTION 7 #define MSG_QUERY_LASTVERSION RID_SFX_START @@ -267,11 +235,9 @@ // compatibility-#defines #define GID_FORMEL GID_MATH -#define GID_ERROR GID_MATH #define GID_OPT GID_OPTIONS #define GID_DOC GID_DOCUMENT #define GID_APP GID_APPLICATION -#define GID_HELP GID_APPLICATION // ========================================================================= @@ -306,21 +272,13 @@ #define MID_DOCINFO_DELETEUSERDATA 0x32 // only for FastPropertySet -#define MID_DOCINFO_AUTHOR 0x10 -#define MID_DOCINFO_CREATIONDATE 0x11 -#define MID_DOCINFO_CREATIONTIME 0x12 -#define MID_DOCINFO_FILENAME 0x14 #define MID_DOCINFO_REVISION 0x15 #define MID_DOCINFO_EDITTIME 0x16 #define MID_DOCINFO_MODIFICATIONAUTHOR 0x18 -#define MID_DOCINFO_MODIFICATIONDATE 0x19 -#define MID_DOCINFO_MODIFICATIONTIME 0x1a #define MID_DOCINFO_TEMPLATE 0x1c #define MID_DOCINFO_PRINTDATE 0x28 -#define MID_DOCINFO_PRINTTIME 0x29 #define MID_DOCINFO_PRINTEDBY 0x2a #define MID_DOCINFO_TEMPLATEDATE 0x2b -#define MID_DOCINFO_ENCRYPTED 0x2c #define MID_DOCINFO_STATISTIC 0x33 #define MID_DOCINFO_CHARLOCALE 0x34 #define MID_CATEGORY 0x35 @@ -329,33 +287,19 @@ #define MID_TYPE 0x38 #define MID_VALUE 0x39 #define MID_VALUESET 0x40 -#define MID_LAST_USED_PROPID MID_VALUESET // Config-Ids ----------------------------------------------------------- #define SFX_ITEMTYPE_SW_BEGIN 20000 -#define SFX_ITEMTYPE_SW_END 22999 +// SFX_ITEMTYPE_SW_END 22999 #define SFX_ITEMTYPE_SD_BEGIN 23000 -#define SFX_ITEMTYPE_SD_END 25999 +// SFX_ITEMTYPE_SD_END 25999 #define SFX_ITEMTYPE_SC_BEGIN 26000 -#define SFX_ITEMTYPE_SC_END 27999 - -#define SFX_ITEMTYPE_SIM_BEGIN 28000 -#define SFX_ITEMTYPE_SIM_END 28999 - -#define SFX_ITEMTYPE_SCH_BEGIN 29000 -#define SFX_ITEMTYPE_SCH_END 29999 - -#define SFX_ITEMTYPE_SMA_BEGIN 30000 -#define SFX_ITEMTYPE_SMA_END 30999 - -#define SFX_ITEMTYPE_SBA_BEGIN 31000 -#define SFX_ITEMTYPE_SBA_END 31999 +// SFX_ITEMTYPE_SC_END 27999 -#define SFX_ITEMTYPE_BASICIDE_BEGIN 32000 -#define SFX_ITEMTYPE_BASICIDE_END 32767 +// free: 28000-32767 // Slot-Ids ------------------------------------------------------------- @@ -371,7 +315,6 @@ #define HID_INTERFACE_SFXHELP_VIEWSH 24 #define RET_NEWTASK 200 -#define RET_PENDING 201 #endif // #ifndef _SFX_HRC diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 939a26b23d6b..fbe6cba2d1db 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -51,14 +51,10 @@ //========================================================================= -#define SID_NONE 0 #define SID_UNKNOWN SID_SFX_START //------------------------------------------------------------------------- -#define SID_STDTENPLATE_MENU_START (SID_SFX_START + 3100) -#define SID_STDTENPLATE_MENU_END (SID_SFX_START + 3140) - // default-ids for application #define SID_QUITAPP (SID_SFX_START + 300) #define SID_ABOUT (SID_SFX_START + 301) @@ -77,9 +73,7 @@ #define SID_PASTE_UNFORMATTED (SID_SFX_START + 314) #define SID_DIALOG_RETURN (SID_SFX_START + 318) #define SID_PRINTER_NOTFOUND_WARN (SID_SFX_START + 320) -#define SID_PRINTER_USETHREAD (SID_SFX_START + 321) #define SID_PRINTER_NAME (SID_SFX_START + 322) -#define SID_PRINTER_FORMATCHG_WARN (SID_SFX_START + 323) #define SID_PRINTER_CHANGESTODOC (SID_SFX_START + 324) #define SID_PRINTPREVIEW (SID_SFX_START + 325) @@ -95,7 +89,6 @@ #define SID_MAIL_ATTACH_FILE (SID_SFX_START + 375) #define SID_MAIL_PREPAREEXPORT (SID_SFX_START + 385) -#define SID_MAIL_NEEDS_PREPAREEXPORT (SID_SFX_START + 386) #define SID_MAIL_EXPORT_FINISHED (SID_SFX_START + 388) #define SID_WEBHTML (SID_SFX_START + 393) @@ -122,11 +115,9 @@ #define SID_HELP_ANNOTATE (SID_SFX_START + 413) #define SID_HELP_BOOKMARK (SID_SFX_START + 414) #define SID_HELP_DOWNLOAD (SID_SFX_START + 415) -#define SID_HELP_START (SID_SFX_START + 416) #define SID_HELP_ZOOMIN (SID_SFX_START + 417) #define SID_HELP_ZOOMOUT (SID_SFX_START + 418) #define SID_HELP_HELPFILEBOX (SID_SFX_START + 419) -#define SID_HELP_HELPFILEBOX_SELECTED (SID_SFX_START + 420) #define SID_SEND_FEEDBACK (SID_SFX_START + 421) #define SID_SHOW_LICENSE (SID_SFX_START + 1683) #define SID_SHOW_CREDITS (SID_SFX_START + 1711) @@ -178,7 +169,6 @@ // browse-ids #define SID_BROWSE_FORWARD (SID_SFX_START + 1300) #define SID_BROWSE_BACKWARD (SID_SFX_START + 1301) -#define SID_BROWSE_HOME (SID_SFX_START + 1303) #define SID_CREATELINK (SID_SFX_START + 1309) #define SID_BOOKMARK_TITLE (SID_SFX_START + 1310) #define SID_BOOKMARK_URL (SID_SFX_START + 1311) @@ -194,7 +184,7 @@ #define SID_FILTER_DATA (SID_SFX_START + 1375) #define SID_EXPLORER_FILEPROPS_START (SID_SFX_START + 1390) -#define SID_EXPLORER_FILEPROPS_END (SID_SFX_START + 1399) +// SID_EXPLORER_FILEPROPS_END (SID_SFX_START + 1399) #define ID_FILETP_START SID_EXPLORER_FILEPROPS_START #define ID_FILETP_READONLY (ID_FILETP_START + 0) @@ -203,7 +193,7 @@ #define SID_ATTR_ZOOM (SID_SVX_START + 1419) #define SID_EXPLORER_PROPS_START (SID_SFX_START + 1410) -#define SID_EXPLORER_PROPS_END (SID_SFX_START + 1499) +// SID_EXPLORER_PROPS_END (SID_SFX_START + 1499) #define SID_AUTOLOAD (SID_SFX_START + 1509) #define SID_FILLFRAME (SID_SFX_START + 1516) @@ -233,20 +223,13 @@ #define SID_OFFICE_PRIVATE_USE (SID_SFX_START + 1606) #define SID_OFFICE_COMMERCIAL_USE (SID_SFX_START + 1607) #define SID_OFFICE_CUSTOMERNUMBER (SID_SFX_START + 1608) -#define SID_OFFICE_INVALIDATE_TITLE (SID_SFX_START + 1609) #define SID_OFFICE_CHECK_PLZ (SID_SFX_START + 1610) #define SID_INTERNET_SEARCH (SID_SFX_START + 1611) #define SID_CURRENT_URL (SID_SFX_START + 1613) -#define SID_FSETHTMLPARSER (SID_SFX_START + 1614) -#define SID_NEXTWINDOW (SID_SFX_START + 1615) -#define SID_PREVWINDOW (SID_SFX_START + 1616) #define SID_OLD_PALK (SID_SFX_START + 1620) #define SID_GROUPVIEW (SID_SFX_START + 1621) -#define SID_NEW_MSG_PARENT (SID_SFX_START + 1622) -#define SID_PGP_ENCODE (SID_SFX_START + 1625) -#define SID_PGP_DECODE (SID_SFX_START + 1626) #define SID_TIPWINDOW (SID_SFX_START + 1632) #define SID_CHARSET (SID_SFX_START + 1633) #define SID_OVERWRITE (SID_SFX_START + 1634) @@ -282,7 +265,6 @@ #define SID_VIEWONLY (SID_SFX_START + 1682) #define SID_REPAIRPACKAGE (SID_SFX_START + 1683) #define SID_ADDONHELP (SID_SFX_START + 1684) -#define SID_OBJECTSHELL (SID_SFX_START + 1685) #define SID_MINIMIZED (SID_SFX_START + 1687) #define SID_COMPONENTDATA (SID_SFX_START + 1688) #define SID_COMPONENTCONTEXT (SID_SFX_START + 1689) @@ -320,8 +302,9 @@ #define SID_PASSWORDINTERACTION (SID_SFX_START + 1723) #define SID_GOTOLINE (SID_SFX_START + 1724) #define SID_SHOWLINES (SID_SFX_START + 1725) -#define SID_SFX_free_START (SID_SFX_START + 1726) -#define SID_SFX_free_END (SID_SFX_START + 3999) + +// SID_SFX_free_START (SID_SFX_START + 1726) +// SID_SFX_free_END (SID_SFX_START + 3999) #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) // FREE, was SID_VIEW_ZOOM_MODE @@ -349,37 +332,26 @@ #define SID_DOC_LOADING (SID_SFX_START + 585) #define SID_IMG_LOADING (SID_SFX_START + 586) #define SID_DOC_SAVED (SID_SFX_START + 599) -#define SID_DOC_MODAL (SID_SFX_START + 655) #define SID_DOCINFO (SID_SFX_START + 535) -#define SID_DOCINFO_LOAD (SID_SFX_START + 536) -#define SID_DOCINFO_SAVE (SID_SFX_START + 537) #define SID_DOCINFO_KEYWORDS (SID_SFX_START + 591) #define SID_DOCINFO_COMMENTS (SID_SFX_START + 592) #define SID_DOCINFO_AUTHOR (SID_SFX_START + 593) -#define SID_HAS_PASSWORD (SID_SFX_START + 536) #define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_DOCVIEW (SID_SFX_START + 597) #define SID_DOCFRAME (SID_SFX_START + 598) -#define SID_ONLYSUBFRAMES (SID_SFX_START + 690) #define SID_TARGETNAME (SID_SFX_START + 560) #define SID_ORIGURL (SID_SFX_START + 644) -#define SID_POSTSTRING (SID_SFX_START + 645) #define SID_POSTDATA (SID_SFX_START + 1536) #define SID_DONELINK (SID_SFX_START + 646) #define SID_REFERER (SID_SFX_START + 654) -#define SID_EXPLORER_CONTENT (SID_SFX_START + 656) #define SID_MODIFIER (SID_SFX_START + 669) #define SID_SETOPTIONS (SID_SFX_START + 670) -#define SID_OPENCOPY (SID_SFX_START + 674) #define SID_SOURCEVIEW (SID_SFX_START + 675) #define SID_DOC_STARTPRESENTATION (SID_SFX_START + 695) #define SID_DDE_RECONNECT_ONLOAD (SID_SFX_START + 696) -#define SID_PLUGFRAMEARG (SID_SFX_START + 666) #define SID_NEWWINDOWFOREDIT (SID_SFX_START + 667) #define SID_DOCTEMPLATE (SID_SFX_START + 538) -#define SID_JSCALL (SID_SFX_START + 1382) #define SID_AUTOPILOTMENU (SID_SFX_START + 1381) // Floating Window Template @@ -400,7 +372,6 @@ #define SID_STYLE_FAMILY5 (SID_STYLE_FAMILY_START + 4) #define SID_ENABLE_METAFILEPRINT (SID_SFX_START + 543) -#define SID_FILEDIALOG_EXTENSION (SID_SFX_START + 544) #define SID_STYLE_NEW (SID_SFX_START + 549) #define SID_STYLE_EDIT (SID_SFX_START + 550) @@ -412,10 +383,7 @@ #define SID_STYLE_NEW_BY_EXAMPLE (SID_SFX_START + 555) #define SID_STYLE_UPDATE_BY_EXAMPLE (SID_SFX_START + 556) #define SID_STYLE_DRAGHIERARCHIE (SID_SFX_START + 565) -#define SID_STYLE_DISABLEDRAGHIERARCHIE (SID_SFX_START + 567) -#define SID_STYLE_DISABLENEW (SID_SFX_START + 568) #define SID_STYLE_MASK (SID_SFX_START + 562) -#define SID_STYLE_NAME (SID_SFX_START + 564) #define SID_STYLE_UPD_BY_EX_NAME (SID_SFX_START + 1585) #define SID_STYLE_REFERENCE (SID_SFX_START + 1602) @@ -423,12 +391,9 @@ #define SID_TEMPLATE_REGION (SID_SFX_START + 661) #define SID_TEMPLATE_REGIONNAME (SID_SFX_START + 662) #define SID_TEMPLATE_LOAD (SID_SFX_START + 663) -#define SID_LOAD_LAYOUT (SID_SFX_START + 664) -#define SID_WRITE_REGFILE (SID_SFX_START + 560) #define SID_INSERT_OBJECT (SID_SFX_START + 561) #define SID_INSERT_FLOATINGFRAME (SID_SFX_START + 563) -#define SID_INSERT_OBJFROMFILE (SID_SFX_START + 671) #define SID_INSERT_PLUGIN (SID_SFX_START + 672) #define SID_INSERT_SOUND (SID_SFX_START + 676) #define SID_INSERT_VIDEO (SID_SFX_START + 677) @@ -437,19 +402,10 @@ #define SID_ACTIVEDOCUMENT (SID_SFX_START + 570) #define SID_DEFAULTFILEPATH (SID_SFX_START + 571) -#define SID_DOCUMENTLIST (SID_SFX_START + 572) #define SID_STYLE_CATALOG (SID_SFX_START + 573) -#define SID_ACTIVEWINDOW (SID_SFX_START + 574) #define SID_OBJECT (SID_SFX_START + 575) -#define SID_THISDOCUMENT (SID_SFX_START + 576) -#define SID_THISWINDOW (SID_SFX_START + 577) -#define SID_TOPWINDOW (SID_SFX_START + 589) -#define SID_ACTIVEMODULE (SID_SFX_START + 587) -#define SID_DOCUMENTS (SID_SFX_START + 578) -#define SID_WINDOWS (SID_SFX_START + 579) // Doc-Properties -#define SID_DOCNAME (SID_SFX_START + 580) #define SID_DOCFULLNAME (SID_SFX_START + 581) #define SID_DOCPATH (SID_SFX_START + 582) #define SID_DOCTITLE (SID_SFX_START + 583) @@ -460,22 +416,9 @@ #define SID_CLOSEWINS (SID_SFX_START + 605) #define SID_MDIWINDOWLIST (SID_SFX_START + 610) -#define SID_MDIWINDOW1 (SID_SFX_START + 611) -#define SID_MDIWINDOW2 (SID_SFX_START + 612) -#define SID_MDIWINDOW3 (SID_SFX_START + 613) -#define SID_MDIWINDOW4 (SID_SFX_START + 614) -#define SID_MDIWINDOW5 (SID_SFX_START + 615) -#define SID_MDIWINDOW6 (SID_SFX_START + 616) -#define SID_MDIWINDOW7 (SID_SFX_START + 617) -#define SID_MDIWINDOW8 (SID_SFX_START + 618) -#define SID_MDIWINDOW9 (SID_SFX_START + 619) -#define SID_MDIWINDOW_END SID_MDIWINDOW9 #define SID_NEWWINDOW (SID_SFX_START + 620) #define SID_CLOSEWIN (SID_SFX_START + 621) -#define SID_OPTIMIZEWIN (SID_SFX_START + 622) #define SID_VIEWSHELL (SID_SFX_START + 623) -#define SID_WIN_MINIMIZED (SID_SFX_START + 625) -#define SID_WIN_MAXIMIZED (SID_SFX_START + 626) #define SID_WIN_FULLSCREEN (SID_SFX_START + 627) // FREE, was SID_WIN_POSSIZE #define SID_WIN_VISIBLE (SID_SFX_START + 629) @@ -485,7 +428,6 @@ #define SID_VIEWSHELL2 (SID_SFX_START + 632) #define SID_VIEWSHELL3 (SID_SFX_START + 633) #define SID_VIEWSHELL4 (SID_SFX_START + 634) -#define SID_RESTOREWIN (SID_SFX_START + 635) #define SID_CAPTION (SID_SFX_START + 641) @@ -507,11 +449,7 @@ #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_FORMATPAINTBRUSH (SID_SFX_START + 715) #define SID_SELECT (SID_SFX_START + 720) -#define SID_EXPANDSELECTION (SID_SFX_START + 721) -#define SID_ENHANCESELECTION (SID_SFX_START + 722) #define SID_SELECTALL (SID_SFX_START + 723) -#define SID_SELECTDOWN (SID_SFX_START + 724) -#define SID_SELECTUP (SID_SFX_START + 725) #define SID_CURSORDOWN (SID_SFX_START + 731) #define SID_CURSORUP (SID_SFX_START + 732) #define SID_CURSORLEFT (SID_SFX_START + 733) @@ -528,8 +466,6 @@ #define SID_CURSOREND (SID_SFX_START + 746) #define SID_FORMATMENU (SID_SFX_START + 780) #define SID_OBJECTMENU0 SID_FORMATMENU -#define SID_OBJECTMENU1 (SID_SFX_START + 781) -#define SID_OBJECTMENU2 (SID_SFX_START + 782) #define SID_OBJECTMENU3 (SID_SFX_START + 783) #define SID_OBJECTMENU_LAST SID_OBJECTMENU3 #define SID_FORMATMENUSTATE (SID_SFX_START + 791) @@ -550,31 +486,14 @@ #define SID_ASYNCHRON (SID_SFX_START + 811) // default-ids for configuration -#define SID_RESTOREMENU (SID_SFX_START + 901) -#define SID_RESTOREACCELS (SID_SFX_START + 902) -#define SID_RESTORETOOLBOX (SID_SFX_START + 903) #define SID_CONFIG (SID_SFX_START + 904) #define SID_TOGGLECOMMONTASKBAR (SID_SFX_START + 928) -#define SID_TOGGLEINETBAR (SID_SFX_START + 928) -#define SID_TOGGLEOBJECTBAR (SID_SFX_START + 905) -#define SID_CONFIGTOOLBOX (SID_SFX_START + 906) #define SID_TOOLBOXOPTIONS (SID_SFX_START + 907) -#define SID_TOGGLETOOLBAR (SID_SFX_START + 909) -#define SID_CUSTOMIZETOOLBOX (SID_SFX_START + 908) #define SID_TOGGLEFUNCTIONBAR (SID_SFX_START + 910) -#define SID_TOGGLEOPTIONBAR (SID_SFX_START + 911) -#define SID_PREPTOGGLEFLOATMODE (SID_SFX_START + 912) -#define SID_TOGGLEFLOATMODE (SID_SFX_START + 913) -#define SID_SETDOCKINGRECTS (SID_SFX_START + 914) -#define SID_SETTOOLBOXLINES (SID_SFX_START + 915) -#define SID_STYLETOOLBOXSYMBOL (SID_SFX_START + 916) -#define SID_STYLETOOLBOXTEXT (SID_SFX_START + 917) #define SID_CONFIGITEMID (SID_SFX_START + 919) #define SID_MACROINFO (SID_SFX_START + 919) #define SID_TOGGLESTATUSBAR (SID_SFX_START + 920) #define SID_CONFIGSTATUSBAR (SID_SFX_START + 921) -#define SID_CONFIGDOCKWIN (SID_SFX_START + 922) -#define SID_TOGGLEMACROBAR (SID_SFX_START + 923) #define SID_CONFIGMENU (SID_SFX_START + 924) #define SID_CONFIGACCEL (SID_SFX_START + 925) #define SID_CONFIGEVENT (SID_SFX_START + 926) @@ -582,7 +501,6 @@ #define SID_SHOWPOPUPS (SID_SFX_START + 929) #define SID_TASKBAR (SID_SFX_START + 931) #define SID_AUTOHIDE (SID_SFX_START + 932) -#define SID_TOGGLENAVBAR (SID_SFX_START + 1603) // Item-Id for the assinged event Tabpage #define SID_ATTR_MACROITEM (SID_SFX_START + 934) @@ -590,9 +508,7 @@ #define SID_SAVECONFIG (SID_SFX_START + 930) #define SID_LOADCONFIG (SID_SFX_START + 933) #define SID_OPTIONS (SID_SFX_START + 940) -#define SID_BASICIDE (SID_SFX_START + 950) #define SID_BASICLOAD (SID_SFX_START + 951) -#define SID_BASICSAVE (SID_SFX_START + 952) #define SID_BASICSAVEAS (SID_SFX_START + 953) #define SID_BASICCOMPILE (SID_SFX_START + 954) #define SID_BASICRUN (SID_SFX_START + 955) @@ -612,119 +528,14 @@ #define SID_BASICBREAK (SID_SFX_START +1521) #define SID_OBJECTRESIZE (SID_SFX_START + 1000) -#define SID_INSERT_TEXT (SID_SFX_START + 1001) #define SID_EVENTCONFIG (SID_SFX_START + 1101) #define SID_VERB_START (SID_SFX_START + 1100) #define SID_VERB_END (SID_SFX_START + 1121) -#define SID_BROWSER_TASK (SID_MACRO_END + 22) - -#define SID_SAVESETTINGS (SID_SFX_START + 1200) -#define SID_OPT_AUTOSAVE (SID_SFX_START + 1201) -#define SID_OPT_AUTOSAVEINTERVAL (SID_SFX_START + 1202) -#define SID_OPT_AUTOSAVEQUERY (SID_SFX_START + 1203) -#define SID_OPT_BACKUP (SID_SFX_START + 1204) -#define SID_OPT_GRAPHICSFORMAT (SID_SFX_START + 1205) -#define SID_OPT_SAVEDOCINFO (SID_SFX_START + 1206) -#define SID_OPT_SAVEWORKINGSET (SID_SFX_START + 1207) -#define SID_OPT_SAVEWINDOWS (SID_SFX_START + 1208) -#define SID_OPT_SAVEVIEW (SID_SFX_START + 1209) - -#define SID_PATHSETTINGS (SID_SFX_START + 1210) -#define SID_OPT_AUTOTEXT_PATH (SID_SFX_START + 1211) -#define SID_OPT_BACKUP_PATH (SID_SFX_START + 1212) -#define SID_OPT_BASIC_PATH (SID_SFX_START + 1213) -#define SID_OPT_CONFIG_PATH (SID_SFX_START + 1214) -#define SID_OPT_DATABASEQUERIES_PATH (SID_SFX_START + 1215) -#define SID_OPT_DICTIONARIES_PATH (SID_SFX_START + 1216) -#define SID_OPT_DOCMANAGERINI_PATH (SID_SFX_START + 1217) -#define SID_OPT_GRAPHICS_PATH (SID_SFX_START + 1218) -#define SID_OPT_MODULES_PATH (SID_SFX_START + 1219) -#define SID_OPT_PALLETS_PATH (SID_SFX_START + 1220) -#define SID_OPT_SUBINI_PATH (SID_SFX_START + 1221) -#define SID_OPT_SYMBOLS_PATH (SID_SFX_START + 1222) -#define SID_OPT_TEMPLATES_PATH (SID_SFX_START + 1223) -#define SID_OPT_WORKING_PATH (SID_SFX_START + 1224) - -#define SID_OPT_DESKTOP_PATH (SID_SFX_START + 1558) -#define SID_OPT_CACHE_PATH (SID_SFX_START + 1559) -#define SID_OPT_HELP_PATH (SID_SFX_START + 1560) -#define SID_OPT_BOOKMARKS_PATH (SID_SFX_START + 1561) -#define SID_OPT_GALLERY_PATH (SID_SFX_START + 1562) -#define SID_OPT_NEWDOC_PATH (SID_SFX_START + 1563) -#define SID_OPT_AGENTS_PATH (SID_SFX_START + 1564) -#define SID_OPT_AUTOPILOT_PATH (SID_SFX_START + 1565) -#define SID_OPT_EXPLORER_PATH (SID_SFX_START + 1566) -#define SID_OPT_TRASH_PATH (SID_SFX_START + 1557) - -#define SID_OPT_STORAGE_PATH (SID_SFX_START + 1627) -#define SID_OPT_STARTMENU_PATH (SID_SFX_START + 1628) -#define SID_OPT_DOWNLOAD_PATH (SID_SFX_START + 1629) -#define SID_OPT_QUICKSTART_PATH (SID_SFX_START + 1630) -#define SID_OPT_GROUP_PATH (SID_SFX_START + 1631) - -#define SID_OPT_PLUGINS_PATH (SID_SFX_START + 1636) -#define SID_OPT_FAVORITES_PATH (SID_SFX_START + 1637) -#define SID_OPT_FILTER_PATH (SID_SFX_START + 1638) -#define SID_OPT_ADDINS_PATH (SID_SFX_START + 1639) -#define SID_OPT_USERCONFIG_PATH (SID_SFX_START + 1641) -#define SID_OPT_USERDICTIONARIES_DIR (SID_SFX_START + 1642) #define SID_SIGNATURE (SID_SFX_START + 1643) -#define SID_OPT_INSTPATH (SID_SFX_START + 1649) -#define SID_OPT_PROGPATH (SID_SFX_START + 1650) -#define SID_OPT_USERPATH (SID_SFX_START + 1651) - -#define SID_CONVERTSTRING (SID_SFX_START + 1225) -#define SID_SYMBOLSET (SID_SFX_START + 1226) -#define SID_BUTTONTYPE (SID_SFX_START + 1227) -#define SID_OUTSTYLE (SID_SFX_START + 1228) -#define SID_FRAMEDESCRIPTOR (SID_SFX_START + 1229) -#define SID_SFXNODES_START (SID_SFX_START + 1230) -#define SID_SFXNODES_SUBJECT (SID_SFXNODES_START) -#define SID_SFXNODES_BCC (SID_SFXNODES_START + 1) -#define SID_SFXNODES_CC (SID_SFXNODES_START + 2) -#define SID_SFXNODES_COMMENTS (SID_SFXNODES_START + 3) -#define SID_SFXNODES_DATE (SID_SFXNODES_START + 4) -#define SID_SFXNODES_FROM (SID_SFXNODES_START + 5) -#define SID_SFXNODES_IN_REPLY_TO (SID_SFXNODES_START + 6) -#define SID_SFXNODES_KEYWORDS (SID_SFXNODES_START + 7) -#define SID_SFXNODES_MESSAGE_ID (SID_SFXNODES_START + 8) -#define SID_SFXNODES_RECEIVED (SID_SFXNODES_START + 9) -#define SID_SFXNODES_REFERENCES (SID_SFXNODES_START + 10) -#define SID_SFXNODES_REPLY_TO (SID_SFXNODES_START + 11) -#define SID_SFXNODES_RETURN_PATH (SID_SFXNODES_START + 12) -#define SID_SFXNODES_SENDER (SID_SFXNODES_START + 13) -#define SID_SFXNODES_TO (SID_SFXNODES_START + 14) -#define SID_SFXNODES_XMAILER (SID_SFXNODES_START + 15) -#define SID_SFXNODES_XSTAROFFICE_RCPT (SID_SFXNODES_START + 16) -#define SID_SFXNODES_MIME_VERSION (SID_SFXNODES_START + 17) -#define SID_SFXNODES_CONTENT_DESCRIPTION (SID_SFXNODES_START + 18) -#define SID_SFXNODES_CONTENT_DISPOSITION (SID_SFXNODES_START + 19) -#define SID_SFXNODES_CONTENT_ID (SID_SFXNODES_START + 20) -#define SID_SFXNODES_CONTENT_TYPE (SID_SFXNODES_START + 21) -#define SID_SFXNODES_CONTENT_TRANSFER_ENCODING (SID_SFXNODES_START + 22) -#define SID_SFXNODES_IS_CONTAINER (SID_SFXNODES_START + 23) -#define SID_SFXNODES_IS_MESSAGE (SID_SFXNODES_START + 24) -#define SID_SFXNODES_IS_MULTIPART (SID_SFXNODES_START + 25) -#define SID_SFXNODES_APPROVED (SID_SFXNODES_START + 26) -#define SID_SFXNODES_CONTROL (SID_SFXNODES_START + 27) -#define SID_SFXNODES_DISTRIBUTION (SID_SFXNODES_START + 28) -#define SID_SFXNODES_EXPIRES (SID_SFXNODES_START + 29) -#define SID_SFXNODES_FOLLOWUPTO (SID_SFXNODES_START + 30) -#define SID_SFXNODES_LINES (SID_SFXNODES_START + 31) -#define SID_SFXNODES_ORGANIZATION (SID_SFXNODES_START + 32) -#define SID_SFXNODES_SUMMARY (SID_SFXNODES_START + 33) -#define SID_SFXNODES_XREF (SID_SFXNODES_START + 34) -#define SID_SFXNODES_XNEWSREADER (SID_SFXNODES_START + 35) -#define SID_SFXNODES_SEND_DATETIME (SID_SFXNODES_START + 36) -#define SID_SFXNODES_RETURN_RECEIPT (SID_SFXNODES_START + 37) -#define SID_SFXNODES_PRIORITY (SID_SFXNODES_START + 38) -#define SID_SFXNODES_MESSAGE (SID_SFXNODES_START + 39) -#define SID_SFXNODES_RECEIVERLIST (SID_SFXNODES_START + 40) -#define SID_SFXNODES_ATTACHLIST (SID_SFXNODES_START + 41) -#define SID_SFXNODES_END SID_SFXNODES_ATTACHLIST +#define SID_FRAMEDESCRIPTOR (SID_SFX_START + 1229) // SaveTabPage #define SID_ATTR_DOCINFO (SID_OPTIONS_START + 0) @@ -744,14 +555,11 @@ #define SID_ATTR_BUTTON_OUTSTYLE3D (SID_OPTIONS_START + 62) #define SID_ATTR_BUTTON_BIGSIZE (SID_OPTIONS_START + 63) #define SID_ATTR_AUTOHELPAGENT (SID_OPTIONS_START + 67) -#define SID_AUTOHELPAGENT_RESET (SID_OPTIONS_START + 68) #define SID_HELPAGENT_TIMEOUT (SID_OPTIONS_START + 93) #define SID_ATTR_WELCOMESCREEN (SID_OPTIONS_START + 81) #define SID_WELCOMESCREEN_RESET (SID_OPTIONS_START + 82) -#define SID_RESTORE_EXPAND_STATE (SID_OPTIONS_START + 83) #define SID_ATTR_QUICKLAUNCHER (SID_OPTIONS_START + 74) #define SID_ATTR_YEAR2000 (SID_OPTIONS_START + 87) -#define SID_ATTR_ALLOWFOLDERWEBVIEW (SID_OPTIONS_START + 92) #define SID_ATTR_APPLYCHARUNIT (SID_OPTIONS_START + 88) @@ -767,25 +575,12 @@ #define SID_AUTOSPELL_CHECK (SID_OPTIONS_START + 21) // InetTabPage -#define SID_INET_SMTPGATEWAY (SID_OPTIONS_START + 50) -#define SID_INET_EMAIL_NAME (SID_OPTIONS_START + 19) -#define SID_INET_PROXY (SID_OPTIONS_START + 20) #define SID_INET_PROXY_TYPE (SID_OPTIONS_START + 23) -#define SID_INET_PROXY_NAME (SID_OPTIONS_START + 24) #define SID_INET_PROXY_PORT (SID_OPTIONS_START + 25) -#define SID_INET_HOMEPAGE (SID_OPTIONS_START + 26) -#define SID_INET_MEMCACHE (SID_OPTIONS_START + 27) -#define SID_INET_DISKCACHE (SID_OPTIONS_START + 28) -#define SID_INET_EXPIRATION (SID_OPTIONS_START + 29) -#define SID_INET_CACHEDIR (SID_OPTIONS_START + 32) #define SID_INET_SMTPSERVER (SID_OPTIONS_START + 33) -#define SID_INET_POPSERVER (SID_OPTIONS_START + 34) -#define SID_INET_MAILUSERNAME (SID_OPTIONS_START + 35) -#define SID_INET_MAILPASSWORD (SID_OPTIONS_START + 36) #define SID_PASSWORD (SID_OPTIONS_START + 36) -#define SID_INET_MAILTEXTFORMAT (SID_OPTIONS_START + 61) #define SID_INET_NOPROXY (SID_OPTIONS_START + 37) @@ -793,41 +588,15 @@ #define SID_INET_HTTP_PROXY_PORT (SID_OPTIONS_START + 39) #define SID_INET_FTP_PROXY_NAME (SID_OPTIONS_START + 40) #define SID_INET_FTP_PROXY_PORT (SID_OPTIONS_START + 41) -#define SID_INET_SOCKS_PROXY_NAME (SID_OPTIONS_START + 42) #define SID_INET_SOCKS_PROXY_PORT (SID_OPTIONS_START + 43) #define SID_INET_SECURITY_PROXY_NAME (SID_OPTIONS_START + 44) #define SID_INET_SECURITY_PROXY_PORT (SID_OPTIONS_START + 45) -#define SID_INET_NNTPSERVER (SID_OPTIONS_START + 46) -#define SID_INET_MAXNEWS (SID_OPTIONS_START + 47) - -#define SID_INET_MAXHTTPCONS (SID_OPTIONS_START + 48) -#define SID_INET_MAXFTPCONS (SID_OPTIONS_START + 49) - -#define SID_INET_EXE_JAVASCRIPT (SID_OPTIONS_START + 51) #define SID_INET_EXE_PLUGIN (SID_OPTIONS_START + 52) -#define SID_INET_EXE_APPLETS (SID_OPTIONS_START + 91) - -#define SID_INET_JAVA_ENABLE (SID_OPTIONS_START + 53) -#define SID_INET_JAVA_ACCESSTYPE (SID_OPTIONS_START + 54) -#define SID_INET_JAVA_SECURITY (SID_OPTIONS_START + 55) -#define SID_INET_JAVA_CLASSPATH (SID_OPTIONS_START + 56) #define SID_INET_DNS_AUTO (SID_OPTIONS_START + 57) #define SID_INET_DNS_SERVER (SID_OPTIONS_START + 58) -#define SID_INET_USERAGENT (SID_OPTIONS_START + 59) -#define SID_INET_NONCACHED_SERVER (SID_OPTIONS_START + 60) - -#define SID_INET_CHANNELS_ONOFF (SID_OPTIONS_START + 64) - -#define SID_INET_COOKIESHANDLE (SID_OPTIONS_START + 69) - -#define SID_INET_CACHEJS (SID_OPTIONS_START + 70) -#define SID_INET_CACHEEXPIRED (SID_OPTIONS_START + 71) -#define SID_INET_CACHEABORTED (SID_OPTIONS_START + 72) -#define SID_INET_REVEAL_MAILADDR (SID_OPTIONS_START + 73) - #define SID_SAVEREL_INET (SID_OPTIONS_START + 30) #define SID_SAVEREL_FSYS (SID_OPTIONS_START + 31) @@ -836,17 +605,9 @@ #define SID_SECURE_URL (SID_OPTIONS_START + 66) - -#define SID_OPT_SCREENSCALING (SID_OPTIONS_START + 78) -#define SID_OPT_SNAPTYPE (SID_OPTIONS_START + 79) -#define SID_OPT_DRAGMODE (SID_OPTIONS_START + 80) - // configured locale changed #define SID_OPT_LOCALE_CHANGED (SID_OPTIONS_START + 94) -#define SID_OPT_FONT_ANTIALIASING_ENABLED (SID_OPTIONS_START + 95) -#define SID_OPT_FONT_ANTIALIASING_MINPIXELS (SID_OPTIONS_START + 96) //middle mouse button -#define SID_OPT_MIDDLE_MOUSE (SID_OPTIONS_START + 97) #define SID_ATTR_PRETTYPRINTING (SID_OPTIONS_START + 98) #define SID_HELP_STYLESHEET (SID_OPTIONS_START + 99) @@ -862,7 +623,6 @@ #define SID_SEARCH_OPTIONS (SID_SVX_START + 281) #define SID_ZOOM (SID_SVX_START + 289) #define SID_SEARCH_ITEM (SID_SVX_START + 291) -#define SID_ATTR_CHAR_FONTWIDTH (SID_SVX_START + 303) #define SID_HYPERLINK_GETLINK (SID_SVX_START + 361) #define SID_HYPERLINK_SETLINK (SID_SVX_START + 362) #define SID_NAVIGATOR (SID_SVX_START + 366) @@ -872,10 +632,6 @@ #define SID_INET_DLG (SID_SVX_START + 416) #define SID_AUTO_CORRECT_DLG (SID_SVX_START + 424) #define SID_SD_AUTOPILOT (SID_SVX_START + 425) -#define SID_SW_AGENDA_WIZZARD (SID_SVX_START + 426) -#define SID_SW_FAX_WIZZARD (SID_SVX_START + 427) -#define SID_SW_LETTER_WIZZARD (SID_SVX_START + 428) -#define SID_SW_MEMO_WIZZARD (SID_SVX_START + 429) #define SID_ATTR_CHAR_COLOR_EXT (SID_SVX_START + 488) #define SID_ATTR_CHAR_COLOR_BACKGROUND (SID_SVX_START + 489) #define SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (SID_SVX_START + 490) @@ -945,8 +701,6 @@ #define FN_PARAM_4 (FN_PARAM+63) #define FN_PARAM_5 (FN_PARAM+64) #define FN_PARAM_6 (FN_PARAM+65) -#define FN_PARAM_7 (FN_PARAM+66) -#define FN_PARAM_8 (FN_PARAM+67) #define FN_FAX (SID_SW_START + 28) /* Fax */ #define SID_KEYFUNC_START (SID_SC_START + 521) @@ -968,17 +722,6 @@ #define ID_VAL_DUMMY0 (SID_SD_START+230) #define ID_VAL_ZOOM (SID_SD_START+234) #define SID_SIZE_OPTIMAL (SID_SD_START+99) -#define SID_ZOOM_OBJECTS (SID_SIZE_OPTIMAL) - -//----------------------------------------------------------------------- - -#define SID_STARWRITER (SID_SFX_START+1401) -#define SID_STARDRAW (SID_SFX_START+1402) -#define SID_STARCALC (SID_SFX_START+1403) - -#define SID_LANGUAGEID (SID_SFX_START+1407) -#define SID_COUNTRYID (SID_SFX_START+1408) -#define SID_SUBSTPATHVARS (SID_SFX_START+1409) //----------------------------------------------------------------------- @@ -991,11 +734,8 @@ #define SID_ZOOM_150_PERCENT (SID_SVX_START + 1423) #define SID_ZOOM_200_PERCENT (SID_SVX_START + 1424) - //----------------------------------------------------------------------- -#define SID_ATTR_CHAR_FILLCOLOR (SID_SFX_START + 1551) - // SfxScriptOrganizerItem #define MID_SCRIPT_ORGANIZER_LANGUAGE 1 // Don't use zero for MID's. It's forbidden to do it! diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index 836a5824402f..e217fa86f827 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -31,10 +31,8 @@ // #defines ***************************************************************** -#define ACC_IBM (RID_SFX_APP_START+2) #define MSG_ERR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7) #define MSG_ERR_NO_ABS_URI_REF (RID_SFX_APP_START+8) -#define MSG_ISPRINTING_QUERYABORT (RID_SFX_APP_START+9) #define MSG_CANT_QUIT (RID_SFX_APP_START+10) #define STR_ISMODIFIED (RID_SFX_APP_START+11) diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc index fd53e2577212..cb80924da50f 100644 --- a/sfx2/source/bastyp/bastyp.hrc +++ b/sfx2/source/bastyp/bastyp.hrc @@ -32,7 +32,5 @@ #define RC_BASTYP RID_SFX_BASTYP_START #define STR_FILTER_NOT_INSTALLED (RC_BASTYP + 9) #define STR_FILTER_CONSULT_SERVICE (RC_BASTYP + 10) -#define STR_MEMEXCEPTION (RC_BASTYP + 28) -#define MSG_MEM_WARN (RC_BASTYP + 29) #define STR_HTML_GENERATOR (RC_BASTYP + 30) diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc index 362f42f75ac8..5fe0fdbe6fe9 100644 --- a/sfx2/source/dialog/dinfdlg.hrc +++ b/sfx2/source/dialog/dinfdlg.hrc @@ -89,7 +89,6 @@ #define ED_INFO4 22 #define FT_COMMENT 23 #define ED_COMMENT 24 -#define GB_INFO 30 #define FT_TEMPL 32 #define FT_TEMPL_VAL 33 #define BTN_EDITLABEL 34 @@ -140,12 +139,6 @@ #define FT_PROPERTIES 92 #define CTRL_PROPERTIES 93 #define BTN_ADD 94 -#define LB_PROPNAME 95 -#define ED_PROPVALUE 96 -#define RB_PROPYES 96 -#define RB_PROPNO 97 -#define LB_PROPTYPE 98 -#define PB_REMOVEPROP 99 #define RB_PROPERTY_YES 100 #define RB_PROPERTY_NO 101 diff --git a/sfx2/source/dialog/passwd.hrc b/sfx2/source/dialog/passwd.hrc index 8a82c853320e..8faa2c6a78ff 100644 --- a/sfx2/source/dialog/passwd.hrc +++ b/sfx2/source/dialog/passwd.hrc @@ -47,7 +47,6 @@ #define FT_PASSWD_CONFIRM2 27 #define ED_PASSWD_CONFIRM2 28 -#define STR_PASSWD_CONFIRM 29 #define STR_PASSWD_MIN_LEN 30 #define STR_PASSWD_EMPTY 31 diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc index 1a22fb2d50fc..3523b1bb5242 100644 --- a/sfx2/source/dialog/templdlg.hrc +++ b/sfx2/source/dialog/templdlg.hrc @@ -24,7 +24,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TB_FMT 1 #define LB_FMT 3 #define BTN_EDIT 11 #define BTN_DELETE 12 @@ -32,11 +31,8 @@ #define BTN_NEW 10 #define LB_FILTER 4 -#define ID_APPLY_TEMPLATE 10 - #define ID_NEW_STYLE_BY_EXAMPLE 20 #define ID_UPDATE_STYLE_BY_EXAMPLE 21 -#define ID_TREEVIEW 22 #define BT_OK 1 #define BT_CANCEL 2 diff --git a/sfx2/source/dialog/versdlg.hrc b/sfx2/source/dialog/versdlg.hrc index 2de7596221e1..fd60b0c61550 100644 --- a/sfx2/source/dialog/versdlg.hrc +++ b/sfx2/source/dialog/versdlg.hrc @@ -44,5 +44,4 @@ #define PB_OK 15 #define PB_CANCEL 16 #define PB_COMPARE 17 -#define PB_MERGE 18 diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index 660f69f99159..91e9043f1790 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -34,11 +34,6 @@ #define RID_SFX_DOC_END (RID_SFX_DIALOG_START-1) #define STR_NODEFPRINTER (RID_SFX_DOC_START+ 0) -#define STR_PRINTER_NOTAVAIL_1 (RID_SFX_DOC_START+ 1) -#define STR_PRINTER_NOTAVAIL_2 (RID_SFX_DOC_START+ 2) -#define STR_PRINTER_NOTAVAIL_3 (RID_SFX_DOC_START+ 3) -#define STR_PRINTER_NOTAVAIL_4 (RID_SFX_DOC_START+ 4) -#define STR_PRINTER_NOTAVAIL_5 (RID_SFX_DOC_START+ 5) #define STR_PRINT_OPTIONS (RID_SFX_DOC_START+ 6) #define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 7) #define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 8) @@ -124,7 +119,6 @@ #define STR_DOCTYPENAME_MESSAGE (RID_SFX_DOC_START+ 75) #define RID_STR_NEW_TASK (RID_SFX_DOC_START+ 76) -#define STR_SAVEANDCLOSE (RID_SFX_DOC_START+ 77) #define STR_NOSAVEANDCLOSE (RID_SFX_DOC_START+ 78) #define STR_PACKNGO_NOACCESS (RID_SFX_DOC_START+ 79) #define STR_PACKNGO_NEWMEDIUM (RID_SFX_DOC_START+ 80) @@ -135,11 +129,6 @@ #define STR_OBJECT (RID_SFX_DOC_START+ 84) -#define DLOAD_URL 1 -#define DLOAD_STATUS 2 -#define DLOAD_NAME 3 -#define DLOAD_TEXT 4 -#define DLOAD_CANCEL 1 #define DLG_MACROQUERY (RID_SFX_DOC_START+87) #define BTN_OK (RID_SFX_DOC_START+88) @@ -158,7 +147,6 @@ // some icons are commented out since they are removed #define BMP_SIGNATURE (RID_SFX_DOC_START+97) #define BMP_128X128_CALC_DOC (RID_SFX_DOC_START+99) -#define BMP_128X128_CHART_DOC (RID_SFX_DOC_START+101) #define BMP_128X128_DRAW_DOC (RID_SFX_DOC_START+102) #define BMP_128X128_IMPRESS_DOC (RID_SFX_DOC_START+104) #define BMP_128X128_MATH_DOC (RID_SFX_DOC_START+107) diff --git a/sfx2/source/doc/doctdlg.hrc b/sfx2/source/doc/doctdlg.hrc index 8deed4699f3b..1b0f7adfa205 100644 --- a/sfx2/source/doc/doctdlg.hrc +++ b/sfx2/source/doc/doctdlg.hrc @@ -34,7 +34,6 @@ #define FT_NAME 6 #define ED_NAME 7 #define BT_OK 10 -#define BT_SECTION 11 #define BT_EDIT 12 #define BT_NEW 13 #define BT_DELETE 15 diff --git a/sfx2/source/doc/docvor.hrc b/sfx2/source/doc/docvor.hrc index c17f424a2a90..247ba2e012c1 100644 --- a/sfx2/source/doc/docvor.hrc +++ b/sfx2/source/doc/docvor.hrc @@ -36,7 +36,6 @@ #define ID_DELETE 203 #define ID_EDIT 204 #define ID_COPY_FROM 211 -#define ID_EXPORT 221 #define ID_RESCAN 220 #define ID_COPY_TO 210 #define ID_NEW 200 @@ -55,8 +54,6 @@ #define BTN_FILES 3 #define BTN_ADDRESSTEMPLATE 4 #define LB_LEFT 1 -#define FT_DEFAULT_TEMPLATE_LABEL 20 -#define FT_DEFAULT_TEMPLATE 21 #define BTN_HELP 100 #ifdef BTN_OK diff --git a/sfx2/source/doc/new.hrc b/sfx2/source/doc/new.hrc index dd8878bf0177..e446464c6ba6 100644 --- a/sfx2/source/doc/new.hrc +++ b/sfx2/source/doc/new.hrc @@ -26,8 +26,6 @@ ************************************************************************/ #define BTN_PREVIEW 51 #define WIN_PREVIEW 50 -#define GB_DOCCLASS 1 -#define LB_DOCCLASS 2 #define GB_DESC 10 #define FT_DESC 11 #define FT_STYLESHEETS 19 @@ -37,7 +35,6 @@ #define FT_KEYWORDS 60 #define FT_TITLE 55 #define ED_DESC 71 -#define FT_DOCINFO 70 #define LB_REGION 21 #define BT_OK 30 #define BT_CANCEL 31 diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index ef5c168c36f0..4e68958e2551 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -33,49 +33,18 @@ // Help-Ids ----------------------------------------------------------------- -#define HID_FILTER_SELECT "SFX2_HID_FILTER_SELECT" -#define HID_USERDEFBMP "SFX2_HID_USERDEFBMP" #define HID_DOCINFO_EDT "SFX2_HID_DOCINFO_EDT" #define HID_PASSWD "SFX2_HID_PASSWD" #define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR" -#define HID_CONFIG_OBJECTBAR "SFX2_HID_CONFIG_OBJECTBAR" #define HID_MANAGE_STYLES "SFX2_HID_MANAGE_STYLES" #define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT" #define HID_DOCINFODESC "SFX2_HID_DOCINFODESC" #define HID_DOCINFODOC "SFX2_HID_DOCINFODOC" #define HID_DOCINFOUSER "SFX2_HID_DOCINFOUSER" -#define HID_BOOKMARKPROPS "SFX2_HID_BOOKMARKPROPS" -#define HID_BOOKGROUPPROPS "SFX2_HID_BOOKGROUPPROPS" -#define HID_BOOKFILEPROPS "SFX2_HID_BOOKFILEPROPS" -#define HID_NEWS_SERVERPROPS "SFX2_HID_NEWS_SERVERPROPS" -#define HID_NEWS_RULEPAGE "SFX2_HID_NEWS_RULEPAGE" -#define HID_MAILINTRAYPROPS "SFX2_HID_MAILINTRAYPROPS" #define HID_DOCINFORELOAD "SFX2_HID_DOCINFORELOAD" -#define HID_NEWS_GROUPPAGE "SFX2_HID_NEWS_GROUPPAGE" -#define HID_NEWS_SERVERPAGE "SFX2_HID_NEWS_SERVERPAGE" -#define HID_EXPLORERCONTROL "SFX2_HID_EXPLORERCONTROL" #define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL" #define HID_CTL_ORGANIZER_LEFT "SFX2_HID_CTL_ORGANIZER_LEFT" #define HID_CTL_ORGANIZER_RIGHT "SFX2_HID_CTL_ORGANIZER_RIGHT" -#define HID_EXPLMAILSRV_GENERAL_PAGE "SFX2_HID_EXPLMAILSRV_GENERAL_PAGE" -#define HID_EXPLMAILSRV_PROTOCOL_PAGE "SFX2_HID_EXPLMAILSRV_PROTOCOL_PAGE" -#define HID_EXPLMAILSRV_DATAMATCH_PAGE "SFX2_HID_EXPLMAILSRV_DATAMATCH_PAGE" -#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE "SFX2_HID_EXPLMAILSRV_SENDJOURNAL_PAGE" -#define HID_EXPLMAIL_GENERAL_PAGE "SFX2_HID_EXPLMAIL_GENERAL_PAGE" -#define HID_NEWS_CTL_RULES "SFX2_HID_NEWS_CTL_RULES" -#define HID_NEWS_CTL_GROUPS "SFX2_HID_NEWS_CTL_GROUPS" -#define HID_CONFIG_OBJECTBAR_CTL "SFX2_HID_CONFIG_OBJECTBAR_CTL" -#define HID_NEWS_QUICKSEARCH "SFX2_HID_NEWS_QUICKSEARCH" -#define HID_NEWS_SERVERVIEWPROPS "SFX2_HID_NEWS_SERVERVIEWPROPS" -#define HID_NEWS_SHOWARTICLEPROPS "SFX2_HID_NEWS_SHOWARTICLEPROPS" -#define HID_NEWS_SHOWGROUPPROPS "SFX2_HID_NEWS_SHOWGROUPPROPS" -#define HID_NEWS_USER "SFX2_HID_NEWS_USER" -#define HID_MULTISELECTION_GENERAL_PAGE "SFX2_HID_MULTISELECTION_GENERAL_PAGE" -#define HID_LINK_GENERAL_PAGE "SFX2_HID_LINK_GENERAL_PAGE" -#define HID_LINK_ADDRESS_PAGE "SFX2_HID_LINK_ADDRESS_PAGE" -#define HID_FOLDER_GENERAL_PAGE "SFX2_HID_FOLDER_GENERAL_PAGE" -#define HID_FILE_GENERAL_PAGE "SFX2_HID_FILE_GENERAL_PAGE" -#define HID_FTP_GENERAL_PAGE "SFX2_HID_FTP_GENERAL_PAGE" #define HID_PRINT_OPTIONS "SFX2_HID_PRINT_OPTIONS" #define HID_PREVIEW_FRAME "SFX2_HID_PREVIEW_FRAME" #define HID_DOCINFO_FRAME "SFX2_HID_DOCINFO_FRAME" @@ -83,22 +52,13 @@ #define HID_APP_WIN "SFX2_HID_APP_WIN" #define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT" #define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER" -#define HID_FTPSERVER_PAGE "SFX2_HID_FTPSERVER_PAGE" -#define HID_DLG_SFX_EXP_SEARCH "SFX2_HID_DLG_SFX_EXP_SEARCH" -#define HID_TP_SFX_EXP_SEARCH_CRITERIA "SFX2_HID_TP_SFX_EXP_SEARCH_CRITERIA" -#define HID_TP_SFX_EXP_SEARCH_PLACE "SFX2_HID_TP_SFX_EXP_SEARCH_PLACE" #define HID_SEARCH_DLG_TABLB "SFX2_HID_SEARCH_DLG_TABLB" #define HID_TEMPLDLG_NEWBYEXAMPLE "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE" #define HID_TEMPLDLG_UPDATEBYEXAMPLE "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE" #define HID_TEMPLDLG_WATERCAN "SFX2_HID_TEMPLDLG_WATERCAN" #define HID_DESKTOP "SFX2_HID_DESKTOP" -#define HID_EXPLORERTOOLSTOOLBOX "SFX2_HID_EXPLORERTOOLSTOOLBOX" -#define HID_EXPLOREROBJECTTOOLBOX "SFX2_HID_EXPLOREROBJECTTOOLBOX" -#define HID_RECORDINGTOOLBOX "SFX2_HID_RECORDINGTOOLBOX" #define HID_FULLSCREENTOOLBOX "SFX2_HID_FULLSCREENTOOLBOX" #define HID_HELPBAR "SFX2_HID_HELPBAR" -#define HID_ENVTOOLBOX "SFX2_HID_ENVTOOLBOX" -#define HID_FRAMESETEDIT_TOOLBOX "SFX2_HID_FRAMESETEDIT_TOOLBOX" #define HID_NAVIGATOR_WINDOW "SFX2_HID_NAVIGATOR_WINDOW" #define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN" #define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN" @@ -106,8 +66,6 @@ #define HID_TEMPLDLG_TOOLBOX_LEFT "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT" #define HID_TEMPLDLG_TOOLBOX_RIGHT "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT" #define HID_EXPLORER_SRCH_COUNT "SFX2_HID_EXPLORER_SRCH_COUNT" -#define HID_BEAMER_SORT_ASCENDING "SFX2_HID_BEAMER_SORT_ASCENDING" -#define HID_BEAMER_SORT_DESCENDING "SFX2_HID_BEAMER_SORT_DESCENDING" #define HID_EXPLORER_SRCH_LATEST_COUNT "SFX2_HID_EXPLORER_SRCH_LATEST_COUNT" #define HID_CONFIG_EVENT_OFFICE_BASED "SFX2_HID_CONFIG_EVENT_OFFICE_BASED" #define HID_CONFIG_EVENT_DOCUMENT_BASED "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED" @@ -123,123 +81,31 @@ #define HID_STYLIST_EDIT "SFX2_HID_STYLIST_EDIT" #define HID_STYLIST_DELETE "SFX2_HID_STYLIST_DELETE" #define HID_EXPLORERMENU_ARRANGEICONS "SFX2_HID_EXPLORERMENU_ARRANGEICONS" -#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID "SFX2_HID_EXPLORERMENU_ARRANGEICONS_ONGRID" -#define HID_EXPLORERMENU_FIXEDICONPOS "SFX2_HID_EXPLORERMENU_FIXEDICONPOS" -#define HID_EXPLORERMENU_OPEN "SFX2_HID_EXPLORERMENU_OPEN" -#define HID_EXPLORERMENU_PRINT "SFX2_HID_EXPLORERMENU_PRINT" -#define HID_EXPLORERMENU_SEARCH "SFX2_HID_EXPLORERMENU_SEARCH" -#define HID_EXPLORERMENU_COPY "SFX2_HID_EXPLORERMENU_COPY" -#define HID_EXPLORERMENU_DELETE "SFX2_HID_EXPLORERMENU_DELETE" -#define HID_EXPLORERMENU_CREATELINK "SFX2_HID_EXPLORERMENU_CREATELINK" -#define HID_EXPLORERMENU_EDITPROPERTIES "SFX2_HID_EXPLORERMENU_EDITPROPERTIES" -#define HID_EXPLORERMENU_DOWNLOAD "SFX2_HID_EXPLORERMENU_DOWNLOAD" #define HID_EXPLORERMENU_STDTEMPLATE "SFX2_HID_EXPLORERMENU_STDTEMPLATE" -#define HID_EXPLORERDLG_FILELIST "SFX2_HID_EXPLORERDLG_FILELIST" -#define HID_PDFOLDERS_WORKPLACE "SFX2_HID_PDFOLDERS_WORKPLACE" -#define HID_PDFOLDERS_EXPLORER "SFX2_HID_PDFOLDERS_EXPLORER" -#define HID_PDFOLDERS_STANDARD "SFX2_HID_PDFOLDERS_STANDARD" -#define HID_PDFOLDERS_ROOT "SFX2_HID_PDFOLDERS_ROOT" -#define HID_PDFOLDERS_DESKTOP "SFX2_HID_PDFOLDERS_DESKTOP" -#define HID_CNTMENU_REMOVE_GROUP "SFX2_HID_CNTMENU_REMOVE_GROUP" -#define HID_CNTMENU_CLEAR_CACHE "SFX2_HID_CNTMENU_CLEAR_CACHE" -#define HID_CNT_SYNC_INFO_DLG "SFX2_HID_CNT_SYNC_INFO_DLG" -#define HID_CNT_REMOVE_REMOVEDLIST "SFX2_HID_CNT_REMOVE_REMOVEDLIST" -#define HID_CNT_ABORT_DIALOG "SFX2_HID_CNT_ABORT_DIALOG" -#define HID_CNT_PAGE_PRJ_DATAEXCHANGE "SFX2_HID_CNT_PAGE_PRJ_DATAEXCHANGE" -#define HID_CHAOSDOC_OBJECTBAR_FILE "SFX2_HID_CHAOSDOC_OBJECTBAR_FILE" -#define HID_CHAOSDOC_OBJECTBAR_MESSAGE "SFX2_HID_CHAOSDOC_OBJECTBAR_MESSAGE" -#define HID_CHAOSDOC_MN_PART_OPEN "SFX2_HID_CHAOSDOC_MN_PART_OPEN" -#define HID_CHAOSDOC_MN_PART_DELETE "SFX2_HID_CHAOSDOC_MN_PART_DELETE" -#define HID_CHAOSDOC_MN_PART_RENAME "SFX2_HID_CHAOSDOC_MN_PART_RENAME" -#define HID_CHAOSDOC_MN_PART_SAVEAS "SFX2_HID_CHAOSDOC_MN_PART_SAVEAS" #define HID_EXPLORER_DOCVIEW_ICON "SFX2_HID_EXPLORER_DOCVIEW_ICON" #define HID_EXPLORER_DOCVIEW_DETAILS "SFX2_HID_EXPLORER_DOCVIEW_DETAILS" #define HID_CHAOSDOC_WIN "SFX2_HID_CHAOSDOC_WIN" #define HID_CHAOSDOC_WIN_HEADER "SFX2_HID_CHAOSDOC_WIN_HEADER" #define HID_CHAOSDOC_WIN_PARTS "SFX2_HID_CHAOSDOC_WIN_PARTS" #define HID_CHAOSDOC_WIN_BODY "SFX2_HID_CHAOSDOC_WIN_BODY" -#define HID_CNT_INSERT_COLUMN "SFX2_HID_CNT_INSERT_COLUMN" -#define HID_CNT_REMOVE_COLUMN "SFX2_HID_CNT_REMOVE_COLUMN" -#define HID_CNT_OPT_WIDTH "SFX2_HID_CNT_OPT_WIDTH" -#define HID_CNT_SORT_ASC "SFX2_HID_CNT_SORT_ASC" -#define HID_CNT_SORT_DESC "SFX2_HID_CNT_SORT_DESC" -#define HID_CNT_RULEPG_OPEN_DIR "SFX2_HID_CNT_RULEPG_OPEN_DIR" -#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK "SFX2_HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK" -#define HID_CHAOSDOC_MN_HEADER_COPYLINK "SFX2_HID_CHAOSDOC_MN_HEADER_COPYLINK" -#define HID_CLEAN_CACHE "SFX2_HID_CLEAN_CACHE" -#define HID_SBOX_LOCATION "SFX2_HID_SBOX_LOCATION" -#define HID_SBOX_SUBSCRIBTION "SFX2_HID_SBOX_SUBSCRIBTION" -#define HID_SBOX_CDF_SUBSCRIBTION "SFX2_HID_SBOX_CDF_SUBSCRIBTION" -#define HID_SBOX_SCHEDULE "SFX2_HID_SBOX_SCHEDULE" -#define HID_SBOX_NOTIFICATION "SFX2_HID_SBOX_NOTIFICATION" -#define HID_SBOX_SDC_GENERAL "SFX2_HID_SBOX_SDC_GENERAL" #define HID_BRWBOX_HEADERBAR "SFX2_HID_BRWBOX_HEADERBAR" -#define HID_CANNOT_CREATE_BMK_HERE "SFX2_HID_CANNOT_CREATE_BMK_HERE" -#define HID_CREATE_BOOKMARK "SFX2_HID_CREATE_BOOKMARK" #define HID_TASKBAR "SFX2_HID_TASKBAR" #define HID_TASKBUTTONBAR "SFX2_HID_TASKBUTTONBAR" #define HID_TASKTOOLBAR "SFX2_HID_TASKTOOLBAR" -#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION "SFX2_HID_CHAOSDOC_SHOW_FSYS_EXTENSION" -#define HID_CNT_FILE "SFX2_HID_CNT_FILE" -#define HID_CHAOSDOC_MN_BODY_OPENLINK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK" -#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK" -#define HID_CHAOSDOC_MN_BODY_DOWNLOAD "SFX2_HID_CHAOSDOC_MN_BODY_DOWNLOAD" -#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK "SFX2_HID_CHAOSDOC_MN_BODY_ADDBOOKMARK" -#define HID_OPEN_MENU_CNT "SFX2_HID_OPEN_MENU_CNT" -#define HID_CNT_OPEN_AS_TEMPLATE "SFX2_HID_CNT_OPEN_AS_TEMPLATE" -#define HID_CNT_OPEN_AS_DOC "SFX2_HID_CNT_OPEN_AS_DOC" -#define HID_PDFOLDERS_TEMPLATE "SFX2_HID_PDFOLDERS_TEMPLATE" -#define HID_EXPLORER_ROOT "SFX2_HID_EXPLORER_ROOT" -#define HID_RESET_URL "SFX2_HID_RESET_URL" -#define HID_PHONE_DIALOG "SFX2_HID_PHONE_DIALOG" -#define HID_QB_RESOLVE_LINK "SFX2_HID_QB_RESOLVE_LINK" -#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_BOLD" -#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC" -#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_BIG_HEADER" -#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER" -#define HID_CNT_MARK_THREAD_MARKED "SFX2_HID_CNT_MARK_THREAD_MARKED" -#define HID_CNT_MARK_THREAD_UNMARKED "SFX2_HID_CNT_MARK_THREAD_UNMARKED" #define HID_CNT_DLG_SEARCH_BT_SHOW "SFX2_HID_CNT_DLG_SEARCH_BT_SHOW" #define HID_CNT_DLG_SEARCH_BT_UPDATE "SFX2_HID_CNT_DLG_SEARCH_BT_UPDATE" #define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE "SFX2_HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE" #define HID_CNT_DLG_SEARCH_BT_STOP "SFX2_HID_CNT_DLG_SEARCH_BT_STOP" #define HID_CNT_PAGE_HEADER "SFX2_HID_CNT_PAGE_HEADER" -#define HID_CNT_DLG_ADDRESS "SFX2_HID_CNT_DLG_ADDRESS" -#define HID_EXPLORERMENU_AUTO_ARRANGEICONS "SFX2_HID_EXPLORERMENU_AUTO_ARRANGEICONS" -#define HID_EXPLORERMENU_AUTO_ADJUSTICONS "SFX2_HID_EXPLORERMENU_AUTO_ADJUSTICONS" -#define HID_EXPLORERMENU_FREE_POSITIONING "SFX2_HID_EXPLORERMENU_FREE_POSITIONING" -#define HID_CNT_TARGET_MENU "SFX2_HID_CNT_TARGET_MENU" #define HID_CNT_PAGE_DESCRIPTION "SFX2_HID_CNT_PAGE_DESCRIPTION" #define HID_CNT_LB_HEADER "SFX2_HID_CNT_LB_HEADER" #define HID_CNT_LB_DESCRIPTION "SFX2_HID_CNT_LB_DESCRIPTION" -#define HID_GROUPVIEW_BIG_SYMBOLS "SFX2_HID_GROUPVIEW_BIG_SYMBOLS" -#define HID_GROUPVIEW_SMALL_SYMBOLS "SFX2_HID_GROUPVIEW_SMALL_SYMBOLS" -#define HID_GROUPVIEW_ADD_GROUP "SFX2_HID_GROUPVIEW_ADD_GROUP" -#define HID_GROUPVIEW_REMOVE_GROUP "SFX2_HID_GROUPVIEW_REMOVE_GROUP" -#define HID_GROUPVIEW_RENAME_GROUP "SFX2_HID_GROUPVIEW_RENAME_GROUP" -#define HID_GROUPVIEW_ADD_BOOKMARK "SFX2_HID_GROUPVIEW_ADD_BOOKMARK" -#define HID_GROUPVIEW_TREE "SFX2_HID_GROUPVIEW_TREE" -#define HID_GROUPVIEW_ADD_AS_FOLDER "SFX2_HID_GROUPVIEW_ADD_AS_FOLDER" -#define HID_GROUPVIEW_ADD_AS_BMK "SFX2_HID_GROUPVIEW_ADD_AS_BMK" -#define HID_GROUPVIEW_REMOVE_BMK "SFX2_HID_GROUPVIEW_REMOVE_BMK" #define HID_GROUPVIEW_CONTENT_BIG "SFX2_HID_GROUPVIEW_CONTENT_BIG" #define HID_GROUPVIEW_CONTENT_SMALL "SFX2_HID_GROUPVIEW_CONTENT_SMALL" #define HID_GROUPVIEW_CONTENT_TREE "SFX2_HID_GROUPVIEW_CONTENT_TREE" -#define HID_GROUPVIEW_SHOW_DOCS "SFX2_HID_GROUPVIEW_SHOW_DOCS" -#define HID_EDIT_TEMPLATE "SFX2_HID_EDIT_TEMPLATE" -#define HID_PDFOLDERS_GRAPHICS "SFX2_HID_PDFOLDERS_GRAPHICS" -#define HID_PDFOLDERS_GROUPS "SFX2_HID_PDFOLDERS_GROUPS" -#define HID_OPEN_CHOOSE_FILTER "SFX2_HID_OPEN_CHOOSE_FILTER" -#define HID_PDFOLDERS_BOOKMARKS "SFX2_HID_PDFOLDERS_BOOKMARKS" -#define HID_PDFOLDERS_FAVORITES_ADD "SFX2_HID_PDFOLDERS_FAVORITES_ADD" -#define HID_PDFOLDERS_FAVORITES_REMOVE "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE" -#define HID_PDFOLDERS_HISTORY "SFX2_HID_PDFOLDERS_HISTORY" -#define HID_CNT_CB_FORCE_BODY_EXPORT "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT" -#define HID_CNT_PAGE_REPSTATE_CONTROL "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL" #define HID_TASKSTATUSBAR "SFX2_HID_TASKSTATUSBAR" #define HID_CNT_PAGE_HEADER_TABBAR "SFX2_HID_CNT_PAGE_HEADER_TABBAR" #define HID_CNT_PAGE_SUBSCR_TABBAR "SFX2_HID_CNT_PAGE_SUBSCR_TABBAR" -#define HID_CHAOSDOC_MN_PART_PRINT "SFX2_HID_CHAOSDOC_MN_PART_PRINT" #define HID_STATUSINDICATOR_TEXT "SFX2_HID_STATUSINDICATOR_TEXT" #define HID_STATUSINDICATOR_PROGRESS "SFX2_HID_STATUSINDICATOR_PROGRESS" #define HID_CNT_VALUE_ADDED_NONE "SFX2_HID_CNT_VALUE_ADDED_NONE" @@ -259,14 +125,6 @@ #define HID_CNT_SENT_VIEW_SENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_SENT_ARTICLES" #define HID_CNT_SENT_VIEW_UNSENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES" #define HID_CNT_SENT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES" -#define HID_MAILWIN_SEND_BUTTON "SFX2_HID_MAILWIN_SEND_BUTTON" -#define HID_MAILWIN_CLOSE_BUTTON "SFX2_HID_MAILWIN_CLOSE_BUTTON" -#define HID_MAILWIN_ROLE_BOX "SFX2_HID_MAILWIN_ROLE_BOX" -#define HID_MAILWIN_ADDRESS_EDIT "SFX2_HID_MAILWIN_ADDRESS_EDIT" -#define HID_MAILWIN_ADDRESS_BOX "SFX2_HID_MAILWIN_ADDRESS_BOX" -#define HID_MAILWIN_SUBJECT_EDIT "SFX2_HID_MAILWIN_SUBJECT_EDIT" -#define HID_MAILWIN_FROM_EDIT "SFX2_HID_MAILWIN_FROM_EDIT" -#define HID_MAILWIN_PRIO_BOX "SFX2_HID_MAILWIN_PRIO_BOX" #define HID_TABDLG_APPLY_BTN "SFX2_HID_TABDLG_APPLY_BTN" #define HID_TP_COMMONPRINTOPTIONS "SFX2_HID_TP_COMMONPRINTOPTIONS" #define HID_HELP_WINDOW "SFX2_HID_HELP_WINDOW" @@ -293,21 +151,14 @@ #define HID_CLOSE_WARNING "SFX2_HID_CLOSE_WARNING" #define HID_DID_SAVE_PACKED_XML "SFX2_HID_DID_SAVE_PACKED_XML" #define HID_HELP_TREELISTBOX_CONTENTS "SFX2_HID_HELP_TREELISTBOX_CONTENTS" -#define HID_CUSTOMIZETOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX" -#define HID_CUSTOMIZETOOLBOX_FUNCTIONS "SFX2_HID_CUSTOMIZETOOLBOX_FUNCTIONS" -#define HID_CUSTOMIZETOOLBOX_TOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX_TOOLBOX" #define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE" #define HID_WARNING_SECURITY_HYPERLINK "SFX2_HID_WARNING_SECURITY_HYPERLINK" -#define HID_USERDEFBMP_TOOLBOX "SFX2_HID_USERDEFBMP_TOOLBOX" -#define HID_CONFIG_LOAD "SFX2_HID_CONFIG_LOAD" #define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE" #define HID_SEARCHDIALOG "SFX2_HID_SEARCHDIALOG" -#define HID_XMLSEC_WARNING_BROKENSIGNATURE "SFX2_HID_XMLSEC_WARNING_BROKENSIGNATURE" -#define HID_XMLSEC_QUERY_LOSINGSIGNATURE "SFX2_HID_XMLSEC_QUERY_LOSINGSIGNATURE" #define HID_XMLSEC_QUERY_SAVEBEFORESIGN "SFX2_HID_XMLSEC_QUERY_SAVEBEFORESIGN" #define HID_XMLSECDLG_MACROWARN "SFX2_HID_XMLSECDLG_MACROWARN" #define HID_XMLSEC_INFO_WRONGDOCFORMAT "SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT" diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc index f2afb54b161c..631e2173c797 100644 --- a/sfx2/source/inc/sfxlocal.hrc +++ b/sfx2/source/inc/sfxlocal.hrc @@ -49,8 +49,6 @@ #define SFX_CB_PROPERTY_NAME (RID_SFX_SFXLOCAL_START + 0) #define SFX_ED_PROPERTY_VALUE (RID_SFX_SFXLOCAL_START + 1) -#define SFX_RB_PROPERTY_YES (RID_SFX_SFXLOCAL_START + 2) -#define SFX_RB_PROPERTY_NO (RID_SFX_SFXLOCAL_START + 3) #define SFX_LB_PROPERTY_TYPE (RID_SFX_SFXLOCAL_START + 4) #define SFX_PB_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 5) #define SFX_WIN_PROPERTY_YESNO (RID_SFX_SFXLOCAL_START + 6) diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc index b437f797c26e..4e5256ead004 100644 --- a/sfx2/source/menu/menu.hrc +++ b/sfx2/source/menu/menu.hrc @@ -32,10 +32,7 @@ // #defines ***************************************************************** -#define DLG_MENUCONFIG (RID_SFX_MENU_START+1) #define IBX_MNUCFG_ALREADY_INCLUDED (RID_SFX_MENU_START+2) -#define QBX_MNUCFG_UNDEFINED_FUNCTIONS (RID_SFX_MENU_START+3) -#define QBX_MNUCFG_POPUP_FUNCTIONS (RID_SFX_MENU_START+4) #define BTN_OK 1 #define BTN_CANCEL 2 @@ -49,15 +46,6 @@ #define BOX_ENTRIES 10 #define TXT_TEXT 11 #define EDT_TEXT 12 -#define TXT_FUNCTIONTEXT 13 -#define TXT_FUNCTIONINFO 14 -#define TXT_DESCRIPTIONTEXT 15 -#define TXT_DESCRIPTIONINFO 16 -#define GRP_MENU 17 -#define TXT_GROUP 18 -#define BOX_GROUP 19 -#define TXT_FUNCTION 20 -#define BOX_FUNCTION 21 #define GRP_FUNCTIONS 22 #define STR_MENU_CFGITEM RID_SFX_MENU_START+1 diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc index adcc3a811b92..28c0c14453ff 100644 --- a/sfx2/source/view/view.hrc +++ b/sfx2/source/view/view.hrc @@ -89,32 +89,12 @@ #define GB_WIDTH 23 #define GB_HEIGHT 24 -#define RB_PIXELWIDTH 25 -#define RB_PERCENTWIDTH 26 -#define RB_RELATIVEWIDTH 27 -#define RB_PIXELHEIGHT 28 -#define RB_PERCENTHEIGHT 29 -#define RB_RELATIVEHEIGHT 30 -#define FT_WIDTHCOMMENT 31 -#define FT_HEIGHTCOMMENT 32 #define FT_WIDTH 33 -#define NM_WIDTH 34 -#define CB_WIDTHFIXED 35 -#define CB_HEIGHTFIXED 36 #define FT_HEIGHT 37 -#define NM_HEIGHT 38 - -#define FT_FRAMESPACING 39 -#define NM_FRAMESPACING 40 -#define CB_FRAMESPACING_INHERIT 41 -#define FT_FRAMESPACINGCOLOR 42 -#define ED_FRAMESPACINGCOLOR 43 -#define CB_FRAMESPACINGCOLOR_INHERIT 44 -#define GB_FRAMESET 45 + #define FL_SEP_LEFT 46 #define FL_SEP_RIGHT 47 -#define STR_FRAME_FILEDLG (RID_SFX_VIEW_START+46) #endif diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 3aabc172f047..fb657b848053 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -67,7 +67,6 @@ #define SID_LOADSYMBOLS (SID_SMA_START + 107) #define SID_SAVESYMBOLS (SID_SMA_START + 108) -#define SID_ZOOMSTATUS (SID_SMA_START + 109) #define SID_MODIFYSTATUS (SID_SMA_START + 110) #define SID_TEXTSTATUS (SID_SMA_START + 111) @@ -86,7 +85,6 @@ #define SID_TOOLBOXWINDOW (SID_SMA_START + 123) #define SID_NO_RIGHT_SPACES (SID_SMA_START + 124) #define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125) -#define SID_DUMMY (SID_SMA_START + 254) #define RID_FONTDIALOG (RID_APP_START + 2) @@ -406,7 +404,6 @@ #define RID_SPANISH_50_NAMES (RID_APP_START + 3113) #define RID_SPANISH_60_NAMES (RID_APP_START + 3114) -#define MN_SUB_SENDTO (RID_APP_START + 3120) #define BMP_ARROW_RIGHT 1 diff --git a/svl/inc/svl/cntwids.hrc b/svl/inc/svl/cntwids.hrc index d14cf590d740..cb1148b7d7db 100644 --- a/svl/inc/svl/cntwids.hrc +++ b/svl/inc/svl/cntwids.hrc @@ -37,35 +37,8 @@ #define WID_CHAOS_START 500 -//FUNC MSG -#define WID_MARK_THREAD_MARKED (499) -#define WID_MARK_THREAD_UNMARKED (498) - -// ARGS -#define WID_DUMMY_ARG1 (WID_CHAOS_START + 0) -#define WID_FACTORY_NO (WID_CHAOS_START + 1) -#define WID_FACTORY_NAME (WID_CHAOS_START + 2) -#define WID_NEWS_XREF (WID_CHAOS_START + 3) -#define WID_CREATION_FLAGS (WID_CHAOS_START + 4) -#define WID_FACTORY_HELP_ID (WID_CHAOS_START + 5) - -//FUNC MSG -#define WID_MSG_START (WID_CHAOS_START + 6) -#define WID_MAIL_REPLY (WID_CHAOS_START + 6) -#define WID_POST_REPLY (WID_CHAOS_START + 7) -#define WID_FORWARD (WID_CHAOS_START + 8) -#define WID_MARK_THREAD_READ (WID_CHAOS_START + 9) -#define WID_HIDE_THREAD (WID_CHAOS_START + 10) -#define WID_HIDE_AUTHOR (WID_CHAOS_START + 11) -#define WID_HIDE_SUBJECT (WID_CHAOS_START + 12) -#define WID_RESEND_MSG (WID_CHAOS_START + 13) -#define WID_MARK_THREAD_UNREAD (WID_CHAOS_START + 14) - //PROP MSG #define WID_PRIORITY (WID_CHAOS_START + 15) -#define WID_RULE_APPLIED (WID_CHAOS_START + 16) -#define WID_MSG_LOCK (WID_CHAOS_START + 17) -#define WID_SEEN_STATUS (WID_CHAOS_START + 18) #define WID_REPLY_TO (WID_CHAOS_START + 19) #define WID_IN_REPLY_TO (WID_CHAOS_START + 20) @@ -83,88 +56,41 @@ #define WID_OUTMSGINTERNALSTATE (WID_CHAOS_START + 31) #define WID_RECIPIENTLIST (WID_CHAOS_START + 32) -#define WID_MSG_END (WID_CHAOS_START + 32) - -//FUNC ALL -#define WID_ALL_START (WID_CHAOS_START + 33) -#define WID_DEFAULT (WID_CHAOS_START + 33) -#define WID_OPEN (WID_CHAOS_START + 34) -#define WID_DELETE (WID_CHAOS_START + 35) -#define WID_CUT (WID_CHAOS_START + 36) -#define WID_COPY (WID_CHAOS_START + 37) -#define WID_PASTE (WID_CHAOS_START + 38) -#define WID_RENAME (WID_CHAOS_START + 39) - -#define WID_HAS_DATA (WID_CHAOS_START + 40) -#define WID_GETDATA (WID_CHAOS_START + 41) -#define WID_PUTDATA (WID_CHAOS_START + 42) //PROP ALL -#define WID_INTERIM_URL (WID_CHAOS_START + 43) #define WID_CONTENT_TYPE (WID_CHAOS_START + 44) #define WID_OWN_URL (WID_CHAOS_START + 45) #define WID_REAL_URL (WID_CHAOS_START + 46) -#define WID_OBSOLETE_TITLE (WID_CHAOS_START + 47) #define WID_FLAG_READONLY (WID_CHAOS_START + 48) -#define WID_REFERED_URL (WID_CHAOS_START + 49) -#define WID_REFERER_COUNT (WID_CHAOS_START + 50) #define WID_FLAG_IS_FOLDER (WID_CHAOS_START + 51) #define WID_FLAG_HAS_FOLDER (WID_CHAOS_START + 52) #define WID_FLAG_IS_MESSAGE (WID_CHAOS_START + 53) -#define WID_FLAG_IS_DOCUMENT (WID_FLAG_IS_MESSAGE) #define WID_FLAG_HAS_MESSAGES (WID_CHAOS_START + 54) #define WID_DATE_CREATED (WID_CHAOS_START + 55) #define WID_DATE_MODIFIED (WID_CHAOS_START + 56) -#define WID_VIEW_DESCRIPTION (WID_CHAOS_START + 57) #define WID_IS_READ (WID_CHAOS_START + 58) #define WID_IS_MARKED (WID_CHAOS_START + 59) -#define WID_ALL_END (WID_CHAOS_START + 59) - -//FUNC FOLDER -#define WID_FOLDER_START (WID_CHAOS_START + 60) -#define WID_SYNCHRONIZE (WID_CHAOS_START + 60) -#define WID_CREATE_NEW (WID_CHAOS_START + 61) -#define WID_INSERT (WID_CHAOS_START + 62) -#define WID_UPDATE (WID_CHAOS_START + 63) -#define WID_IMPORT (WID_CHAOS_START + 64) //PROP FOLDER VIEW -#define WID_DUMMY_PROPFOLDERVIEW1 (WID_CHAOS_START + 65) #define WID_THREADING (WID_CHAOS_START + 66) #define WID_FOLDERVIEW_MODE (WID_CHAOS_START + 69) #define WID_MESSAGEVIEW_MODE (WID_CHAOS_START + 70) #define WID_SENTMESSAGEVIEW_MODE (WID_CHAOS_START + 71) -#define WID_SORTING (WID_CHAOS_START + 72) #define WID_THREADED (WID_CHAOS_START + 73) -#define WID_FILTERED (WID_CHAOS_START + 74) #define WID_RULES (WID_CHAOS_START + 75) #define WID_SUBSCRNEWSGROUPCOUNT (WID_CHAOS_START + 76) #define WID_FLAG_SUBSCRIBED (WID_CHAOS_START + 77) -#define WID_FLAG_SUPPORTMODE (WID_CHAOS_START + 78) //PROP FOLDER DIR -#define WID_DUMMY_FOLDERDIR1 (WID_CHAOS_START + 79) #define WID_TOTALCONTENTCOUNT (WID_CHAOS_START + 80) -#define WID_KNOWN_RANGES (WID_CHAOS_START + 83) -#define WID_IMAPFOLDERINFO (WID_CHAOS_START + 84) //PROP FOLDER USER -#define WID_DUMMY_FOLDERUSER1 (WID_CHAOS_START + 85) #define WID_SEENCONTENTCOUNT (WID_CHAOS_START + 86) -#define WID_UNREAD_ARTICLECOUNT (WID_SEENCONTENTCOUNT) -#define WID_SENTCONTENTCOUNT (WID_SEENCONTENTCOUNT) -#define WID_READ_RANGES (WID_CHAOS_START + 87) -#define WID_MARK_RANGES (WID_CHAOS_START + 88) -#define WID_FOLDER_END (WID_CHAOS_START + 88) //PROP BOXALL -#define WID_BOXALL_START (WID_CHAOS_START + 89) -// Used for d&d of View Storages... -#define WID_PREPARE_MOVE (WID_CHAOS_START + 89) -#define WID_OUTTRAY_WANTED (WID_CHAOS_START + 90) #define WID_USERNAME (WID_CHAOS_START + 91) #define WID_PASSWORD (WID_CHAOS_START + 92) #define WID_SERVERNAME (WID_CHAOS_START + 93) @@ -175,59 +101,27 @@ #define WID_AUTOUPDATE_INTERVAL (WID_CHAOS_START + 105) #define WID_UPDATE_ENABLED (WID_CHAOS_START + 106) -#define WID_BOXALL_END (WID_CHAOS_START + 106) //PROP BOX RNMGR -#define WID_BOXEXT_START (WID_CHAOS_START + 107) #define WID_CONNECTION_MODE (WID_CHAOS_START + 107) -#define WID_NEWS_GROUPLIST (WID_CHAOS_START + 108) #define WID_MESSAGE_STOREMODE (WID_CHAOS_START + 109) #define WID_DELETE_ON_SERVER (WID_CHAOS_START + 110) -//PROP BOX USER - -//PROP BOX OUT DIR -#define WID_OUTMSGEXTERNALSTATE (WID_CHAOS_START + 111) - -//PROP RNM -#define WID_RNM_UPDATETIMER_LIST (WID_CHAOS_START + 112) -#define WID_BOXEXT_END (WID_CHAOS_START + 112) - ////////////////////////////////////////////////////////////////////////// // MISC - Added after initial pool version ////////////////////////////////////////////////////////////////////////// -// PROP BOX -#define WID_SERVER_RANGES (WID_CHAOS_START + 113) -#define WID_LAST_UPDATE (WID_CHAOS_START + 114) -#define WID_LAST_MSGID (WID_CHAOS_START + 115) -#define WID_LAST_UID (WID_CHAOS_START + 116) - -// FUNC ALL -#define WID_UNDELETE (WID_CHAOS_START + 117) -#define WID_CLOSE (WID_CHAOS_START + 118) -#define WID_REOPEN (WID_CHAOS_START + 119) - -// PROP RNM -#define WID_RNM_FILECONVERSION_LIST (WID_CHAOS_START + 120) - // PROP FOLDER #define WID_SHOW_MSGS_HAS_TIMELIMIT (WID_CHAOS_START + 121) #define WID_SHOW_MSGS_TIMELIMIT (WID_CHAOS_START + 122) #define WID_STORE_MSGS_HAS_TIMELIMIT (WID_CHAOS_START + 123) #define WID_STORE_MSGS_TIMELIMIT (WID_CHAOS_START + 124) -// PROP BOX - ////////////////////////////////////////////////////////////////////////// // WID's added after SO 4.0 release ( SUPD > 364 ) ////////////////////////////////////////////////////////////////////////// -// PROP ALL -#define WID_PROPERTYLIST (WID_CHAOS_START + 126) - // PROP BOXALL -#define WID_BOXALL_START2 (WID_CHAOS_START + 127) #define WID_SEND_PUBLIC_PROT_ID (WID_CHAOS_START + 127) #define WID_SEND_PRIVATE_PROT_ID (WID_CHAOS_START + 128) #define WID_SEND_PUBLIC_OUTBOXPROPS (WID_CHAOS_START + 129) @@ -239,158 +133,58 @@ #define WID_SEND_FROM_DEFAULT (WID_CHAOS_START + 135) #define WID_VIM_POPATH (WID_CHAOS_START + 136) #define WID_SEND_VIM_POPATH (WID_CHAOS_START + 137) -#define WID_PURGE (WID_CHAOS_START + 138) -#define WID_CLEAN_CACHE (WID_CHAOS_START + 139) -#define WID_SEARCH (WID_CHAOS_START + 140) -#define WID_JOURNAL (WID_CHAOS_START + 141) #define WID_LOCALBASE (WID_CHAOS_START + 142) -#define WID_BOXALL_END2 (WID_CHAOS_START + 142) // PROP DOCUMENT #define WID_DOCUMENT_HEADER (WID_CHAOS_START + 143) #define WID_DOCUMENT_BODY (WID_CHAOS_START + 144) #define WID_DOCUMENT_SIZE (WID_CHAOS_START + 145) -// PROP ALL -#define WID_SIZE WID_DOCUMENT_SIZE - -// PROP PROJECT -#define WID_PRJ_MEDIUM (WID_CHAOS_START + 146) -#define WID_PRJ_FILENAMECONVENTION (WID_CHAOS_START + 147) - // PROP FSYS #define WID_FSYS_DISKSPACE_LEFT (WID_CHAOS_START + 148) -#define WID_TRANSFER (WID_CHAOS_START + 149) // PROP ALL #define WID_KEYWORDS (WID_CHAOS_START + 150) -#define WID_IS_PROTECTED (WID_CHAOS_START + 151) // PROP SEARCH #define WID_SEARCH_CRITERIA (WID_CHAOS_START + 152) #define WID_SEARCH_LOCATIONS (WID_CHAOS_START + 153) #define WID_SEARCH_RECURSIVE (WID_CHAOS_START + 154) -#define WID_SEARCH_FOLDER_VIEW (WID_CHAOS_START + 155) -#define WID_SEARCH_DOCUMENT_VIEW (WID_CHAOS_START + 156) // PROP Channel -#define WID_SCHEDULE_RANGE (WID_CHAOS_START + 157) -#define WID_ALLOWED_SCHEDULE_RANGE (WID_CHAOS_START + 158) #define WID_TARGET_URL (WID_CHAOS_START + 159) -#define WID_FREQUENCY (WID_CHAOS_START + 160) // PROP HTTP #define WID_HTTP_CONNECTION_LIMIT (WID_CHAOS_START + 161) -#define WID_HTTP_COOKIE_MANAGER (WID_CHAOS_START + 162) - -// PROP Channel -#define WID_COLUMN_NEXT_UPD (WID_CHAOS_START + 163) -#define WID_CRAWL_STATUS (WID_CHAOS_START + 164) -#define WID_CRAWL_LEVEL (WID_CHAOS_START + 165) -#define WID_CRAWL_MODE (WID_CHAOS_START + 166) -// WID_CRAWL_MAX_VOLUME shall be removed in the future! -// --> WID_SIZE_LIMIT -#define WID_CRAWL_MAX_VOLUME (WID_CHAOS_START + 167) -#define WID_CRAWL_IMAGE (WID_CHAOS_START + 168) -#define WID_CRAWL_LINK_OUT (WID_CHAOS_START + 169) -#define WID_NOTIFICATION_MODE (WID_CHAOS_START + 170) -#define WID_NOTIFICATION_ADDRESS (WID_CHAOS_START + 171) // PROP BOXALL #define WID_ACCOUNT (WID_CHAOS_START + 172) // PROP FSYS -#define WID_FSYS_KIND (WID_CHAOS_START + 173) #define WID_FSYS_FLAGS (WID_CHAOS_START + 174) -// PROP FOLDER -#define WID_VIEWDATA /* obsolete */ (WID_CHAOS_START + 175) - // PROP FSYS #define WID_WHO_IS_MASTER (WID_CHAOS_START + 176) -// FUNC HTTP -#define WID_HTTP_POST (WID_CHAOS_START + 177) - // PROP ALL -#define WID_SUPPORTED_FUNCS (WID_CHAOS_START + 178) #define WID_SIZE_LIMIT (WID_CHAOS_START + 179) // PROP FOLDER #define WID_MARKED_DOCUMENT_COUNT (WID_CHAOS_START + 180) #define WID_FOLDER_COUNT (WID_CHAOS_START + 181) -// PROP FSYS -#define WID_FSYS_SHOW_HIDDEN (WID_CHAOS_START + 182) - // TRASHCAN -#define WID_TRASHCAN_START (WID_CHAOS_START + 183) -#define WID_TRASHCAN_EMPTY_TRASH (WID_CHAOS_START + 183) #define WID_TRASHCAN_FLAG_AUTODELETE (WID_CHAOS_START + 184) #define WID_TRASHCAN_FLAG_CONFIRMEMPTY (WID_CHAOS_START + 185) -#define WID_TRASHCAN_DUMMY1 (WID_CHAOS_START + 186) -#define WID_TRASHCAN_DUMMY2 (WID_CHAOS_START + 187) -#define WID_TRASHCAN_END (WID_CHAOS_START + 187) // TRASH -#define WID_TRASH_START (WID_CHAOS_START + 188) -#define WID_TRASH_RESTORE (WID_CHAOS_START + 188) #define WID_TRASH_ORIGIN (WID_CHAOS_START + 189) -#define WID_TRASH_DUMMY2 (WID_CHAOS_START + 190) -#define WID_TRASH_END (WID_CHAOS_START + 190) // PROP ALL #define WID_TARGET_FRAMES (WID_CHAOS_START + 191) -// FUNC FOLDER -#define WID_EXPORT (WID_CHAOS_START + 192) - -// COMPONENT -#define WID_COMPONENT_COMMAND (WID_CHAOS_START + 193) -#define WID_COMPONENT_MENU (WID_CHAOS_START + 194) - -// PROP Channel -#define WID_HREF (WID_CHAOS_START + 195) - -// PROP FOLDER (VIEW) -#define WID_VIEW_START (WID_CHAOS_START + 196) -#define WID_VIEW_COLS_BEAMER (WID_CHAOS_START + 196) -#define WID_VIEW_COLS_FILEDLG (WID_CHAOS_START + 197) -#define WID_VIEW_COLS_FLDWIN (WID_CHAOS_START + 198) -#define WID_VIEW_MODE_FLDWIN (WID_CHAOS_START + 199) -#define WID_VIEW_LAYOUT_FLDWIN (WID_CHAOS_START + 200) -#define WID_VIEW_ICON_POS_FLDWIN (WID_CHAOS_START + 201) -#define WID_VIEW_SORT_BEAMER (WID_CHAOS_START + 202) -#define WID_VIEW_SORT_FILEDLG (WID_CHAOS_START + 203) -#define WID_VIEW_SORT_FLDWIN_DETAILS (WID_CHAOS_START + 204) -#define WID_VIEW_SORT_FLDWIN_ICON (WID_CHAOS_START + 205) -#define WID_VIEW_WINDOW_POS_FLDWIN (WID_CHAOS_START + 206) -#define WID_VIEW_END (WID_CHAOS_START + 206) - -// PROP ALL -#define WID_IS_INVALID (WID_CHAOS_START + 207) - -// PROP Channel -#define WID_VIEW_TIPHELP (WID_CHAOS_START + 208) -#define WID_PUBLISHER_SCHEDULE (WID_CHAOS_START + 209) -#define WID_GETMODE (WID_CHAOS_START + 210) -#define WID_READ_OFFLINE (WID_CHAOS_START + 211) - // PROP ALL -#define WID_ALL_START2 (WID_CHAOS_START + 212) -#define WID_REAL_NAME (WID_CHAOS_START + 212) #define WID_FLAG_UPDATE_ON_OPEN (WID_CHAOS_START + 213) -#define WID_ACTION_LIST (WID_CHAOS_START + 214) -#define WID_EDIT_STRING (WID_CHAOS_START + 215) -#define WID_SET_AS_DEFAULT (WID_CHAOS_START + 216) -#define WID_ALL_END2 (WID_CHAOS_START + 216) - -// PROP FOLDER (VIEW) -#define WID_VIEW2_START (WID_CHAOS_START + 217) -#define WID_VIEW2_FLD_PIC (WID_CHAOS_START + 217) -#define WID_FLAG_EXPANDED (WID_CHAOS_START + 218) -#define WID_CHILD_DEFAULTS (WID_CHAOS_START + 219) -#define WID_VIEW2_END (WID_CHAOS_START + 219) // PROP HTTP #define WID_HTTP_KEEP_EXPIRED (WID_CHAOS_START + 220) @@ -398,64 +192,19 @@ #define WID_HTTP_NOCACHE_LIST (WID_CHAOS_START + 222) #define WID_HTTP_REFERER (WID_CHAOS_START + 223) -// PROP FSYS -#define WID_FSYS_START (WID_CHAOS_START + 224) -#define WID_FSYS_VALUE_FOLDER (WID_CHAOS_START + 224) -#define WID_FSYS_SHOW_EXTENSION (WID_CHAOS_START + 225) -#define WID_VALUE_ADDED_MODE (WID_CHAOS_START + 226) -#define WID_FSYS_DUMMY3 (WID_CHAOS_START + 227) -#define WID_FSYS_DUMMY4 (WID_CHAOS_START + 228) -#define WID_FSYS_END (WID_CHAOS_START + 228) - -// FUNC HTTP -#define WID_HTTP_GET_COOKIE (WID_CHAOS_START + 229) -#define WID_HTTP_SET_COOKIE (WID_CHAOS_START + 230) - // PROP HTTP #define WID_HTTP_COOKIE (WID_CHAOS_START + 231) -#define WID_HTTP_DUMMY_1 (WID_CHAOS_START + 232) ////////////////////////////////////////////////////////////////////////// // WID's added after SO 5.0 release ( SUPD > 505 ) ////////////////////////////////////////////////////////////////////////// // PROP FOLDER -#define WID_FOLDER_START2 (WID_CHAOS_START + 233) #define WID_USER_SORT_CRITERIUM (WID_CHAOS_START + 233) -#define WID_HEADER_CONFIG (WID_CHAOS_START + 234) -#define WID_GROUPVIEW_CONFIG (WID_CHAOS_START + 235) -#define WID_FLD_WEBVIEW_TEMPLATE (WID_CHAOS_START + 236) -// eigene Iconpositionen fuer den Explorer, da er noch -// keinen eigenen View-Storage hat -#define WID_VIEW_ICON_POS_GRPWIN (WID_CHAOS_START + 237) -#define WID_FOLDER_END2 (WID_CHAOS_START + 237) - -// PROP ALL -#define WID_SHOW_IN_EXPLORER (WID_CHAOS_START + 238) - -// PROP FOLDER (VIEW) -#define WID_VIEW3_START (WID_CHAOS_START + 239) -#define WID_FLD_FONT (WID_CHAOS_START + 239) -#define WID_FLD_WEBVIEW_USE_GLOBAL (WID_CHAOS_START + 240) -#define WID_VIEW3_DUMMY2 (WID_CHAOS_START + 241) -#define WID_VIEW3_DUMMY3 (WID_CHAOS_START + 242) -#define WID_VIEW3_END (WID_CHAOS_START + 242) // PROP FTP #define WID_FTP_ACCOUNT (WID_CHAOS_START + 243) -// PROP FOLDER -#define WID_STORE_MARKED (WID_CHAOS_START + 244) - -// REPLICATION ( Currently only here to have file compatibility between -// SO51 Client and SO51 Server, for which the functionality -// first shall be implemented ). -#define WID_REPLICATION_1 (WID_CHAOS_START + 245) -#define WID_REPLICATION_2 (WID_CHAOS_START + 246) -#define WID_REPLICATION_3 (WID_CHAOS_START + 247) -#define WID_REPLICATION_4 (WID_CHAOS_START + 248) -#define WID_REPLICATION_5 (WID_CHAOS_START + 249) - // PROP SEARCH #define WID_SEARCH_INDIRECTIONS (WID_CHAOS_START + 250) @@ -463,10 +212,6 @@ #define WID_SEND_FORMATS (WID_CHAOS_START + 251) #define WID_SEND_COPY_TARGET (WID_CHAOS_START + 252) -// FUNC ALL -#define WID_TRANSFER_RESULT (WID_CHAOS_START + 253) - // END -#define WID_CHAOS_END (WID_CHAOS_START + 253) #endif /* !_CNTWIDS_HRC */ diff --git a/svl/inc/svl/memberid.hrc b/svl/inc/svl/memberid.hrc index 7047e0d75e8f..cdcb04f45dd7 100644 --- a/svl/inc/svl/memberid.hrc +++ b/svl/inc/svl/memberid.hrc @@ -28,8 +28,6 @@ #ifndef _MEMBERID_HRC #define _MEMBERID_HRC -#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF ) -#define SFX_SLOTID(nUserData) ( (nUserData) & 0xFFFF ) #define MID_X 1 #define MID_Y 2 diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc index d14c51e5b6c5..4fe5413b068e 100644 --- a/svl/inc/svl/solar.hrc +++ b/svl/inc/svl/solar.hrc @@ -112,7 +112,7 @@ // do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000) #define RID_APP_START 20000 -#define RID_APP_END 31999 +// RID_APP_END 31999 #define RID_SW_START (20000) // RID_SW_END (25999) @@ -130,142 +130,47 @@ #define RID_FORMULA_START (RID_OBJ_START+1001) // RID_FORMULA_END (RID_OBJ_START+1200) -// Help-Ids -------------------------------------------------------------- -#define HID_OK_BUTTON 0 -#define HID_CANCEL_BUTTON 0 -#define HID_HELP_BUTTON 0 +// Help-Ids -------------------------------------------------------------- #define HID_START 32768 #define HID_VCL_START (HID_START+100) -#define HID_VCL_END (HID_START+150) +// HID_VCL_END (HID_START+150) -#define HID_SVTOOLS_START (HID_START+200) -#define HID_SVTOOLS_END (HID_START+299) +// free: 200-299 #define HID_SFX_START (HID_START+300) -#define HID_SFX_END (HID_START+999) +// HID_SFX_END (HID_START+999) #define HID_LIB_START (HID_START+1000) -#define HID_LIB_END (HID_START+19999) - -#define HID_SVX_START (HID_LIB_START) -#define HID_SVX_END (HID_LIB_START+431) - -#define HID_WIZARD_START (HID_LIB_START+432) -#define HID_WIZARD_END (HID_LIB_START+999) -//please note: There is also HID_WIZARD2 below +// HID_LIB_END (HID_START+19999) -// FREE +// free: HID_LIB_START 0-1699 -#define HID_CUI_START (HID_LIB_START+1100) -#define HID_CUI_END (HID_LIB_START+1699) - -#define HID_OFA_START (HID_LIB_START+1760) +// HID_OFA_START (HID_LIB_START+1760) #define HID_OFA_END (HID_LIB_START+1999) -#define HID_HELP_START (HID_LIB_START+2000) -#define HID_HELP_END (HID_LIB_START+2050) +// free: HID_LIB_START 2000-2050 #define HID_CHAOS_START (HID_LIB_START+2051) -#define HID_CHAOS_END (HID_LIB_START+2069) - -#define HID_UUI_START (HID_LIB_START+2070) -#define HID_UUI_END (HID_LIB_START+2099) - -#define HID_GOODIES_START (HID_LIB_START+2100) -#define HID_GOODIES_END (HID_LIB_START+2199) - -#define HID_EDIT_START (HID_LIB_START+2200) -#define HID_EDIT_END (HID_LIB_START+3399) - -#define HID_CHANNEL_START (HID_LIB_START+3400) -#define HID_CHANNEL_END (HID_LIB_START+3499) - -#define HID_SBA_START (HID_LIB_START+ 3500) -#define HID_SBA_END (HID_LIB_START+ 3999) - -#define HID_FORMS_START (HID_LIB_START+4000) -#define HID_FORMS_END (HID_LIB_START+4999) - -#define HID_DBACCESS_START (HID_LIB_START+5000) -#define HID_DBACCESS_END (HID_LIB_START+5299) - -#define HID_PORTAL_START (HID_LIB_START+5300) -#define HID_PORTAL_END (HID_LIB_START+5599) - -#define HID_PORTAL_ADMIN_START (HID_LIB_START+5600) -#define HID_PORTAL_ADMIN_END (HID_LIB_START+5999) - -#define HID_SYNCACCESS_START (HID_LIB_START+6000) -#define HID_SYNCACCESS_END (HID_LIB_START+6099) +// HID_CHAOS_END (HID_LIB_START+2069) -#define HID_SVX_EXT0_START (HID_LIB_START+6100) -#define HID_SVX_EXT0_END (HID_LIB_START+6599) +// free: HID_LIB_START 2070-9999 -#define HID_FRAMEWORK_START (HID_LIB_START+6600) -#define HID_FRAMEWORK_END (HID_LIB_START+6999) - -#define HID_WIZARD2_START (HID_LIB_START+7000) -#define HID_WIZARD2_END (HID_LIB_START+8999) - -#define HID_DESKTOP_START (HID_LIB_START+9000) -#define HID_DESKTOP_END (HID_LIB_START+9299) - -#define HID_XMLSECURITY_START (HID_LIB_START+9300) -#define HID_XMLSECURITY_END (HID_LIB_START+9999) - -#define HID_APP_START (HID_START+20000) -#define HID_APP_END (HID_START+29999) - -#define HID_SW_START (HID_START+20000) -#define HID_SW_END (HID_START+24999) +// free: HID_START 20000-24999 #define HID_SC_START (HID_START+25000) -#define HID_SC_END (HID_START+26999) +// HID_SC_END (HID_START+26999) #define HID_SD_START (HID_START+27000) -#define HID_SD_END (HID_START+27999) - -#define HID_Sa_START (HID_START+28000) -#define HID_Sa_END (HID_START+28999) +// HID_SD_END (HID_START+27999) -#define HID_Sb_START (HID_START+29000) -#define HID_Sb_END (HID_START+29999) +// free: HID_START 28000-29999 #define HID_OBJ_START (HID_START+30000) -#define HID_OBJ_END (HID_START+32767) - -#define HID_CUI3_START (HID_OBJ_START+ 0) -#define HID_CUI3_END (HID_OBJ_START+ 239) - -#define HID_AVMEDIA_START (HID_OBJ_START+ 240) -#define HID_AVMEDIA_END (HID_OBJ_START+ 255) - -#define HID_SMA_START (HID_OBJ_START+ 256) -#define HID_SMA_END (HID_OBJ_START+ 511) - -#define HID_SCH_START (HID_OBJ_START+ 512) -#define HID_SCH_END (HID_OBJ_START+ 767) - -#define HID_BASICIDE_START (HID_OBJ_START+ 768) -#define HID_BASICIDE_END (HID_OBJ_START+1023) - -#define HID_SMA2_START (HID_OBJ_START+1024) -#define HID_SMA2_END (HID_OBJ_START+1280) - -#define HID_FILTER_START (HID_OBJ_START+1281) -#define HID_FILTER_END (HID_OBJ_START+1580) - -#define HID_LICENSING_START (HID_OBJ_START+1581) -#define HID_LICENSING_END (HID_OBJ_START+1680) - -#define HID_RPT_START (HID_OBJ_START+1681) -#define HID_RPT_END (HID_OBJ_START+2080) +// HID_OBJ_END (HID_START+32767) -#define HID_FORMULA_START (HID_OBJ_START+2081) -#define HID_FORMULA_END (HID_OBJ_START+2280) #define HID_EXTENSIONS_START (HID_OBJ_START+2281) #define HID_EXTENSIONS_END (HID_OBJ_START+2800) @@ -273,32 +178,30 @@ // Slot Ids #define SID_SFX_START 5000 -#define SID_SFX_END 8999 +// SID_SFX_END 8999 #define SID_DOCKWIN_START 9800 -#define SID_DOCKWIN_END 9999 +// SID_DOCKWIN_END 9999 #define SID_LIB_START 10000 -#define SID_LIB_END 19999 -#define SID_APP_START 20000 -#define SID_APP_END 29999 +// SID_LIB_END 19999 +// free: 20000-29999 #define SID_OBJ_START 30000 #define SID_SW_START 20000 -#define SID_SW_END 25999 +// SID_SW_END 25999 #define SID_SC_START 26000 -#define SID_SC_END 26999 +// SID_SC_END 26999 #define SID_SD_START 27000 -#define SID_SD_END 27999 +// SID_SD_END 27999 -#define SID_OBJ0_START (SID_OBJ_START + 0) #define SID_OBJ2_START (SID_OBJ_START + 256) #define SID_OBJ1_START (SID_OBJ_START + 512) #define SID_OBJ3_START (SID_OBJ_START + 768) #define SID_SMA_START SID_OBJ2_START -#define SID_SMA_END (SID_SMA_START + 255 ) +// SID_SMA_END (SID_SMA_START + 255 ) #define SID_BASICIDE_START (SID_OBJ3_START) -#define SID_BASICIDE_END (SID_BASICIDE_START + 255) +// SID_BASICIDE_END (SID_BASICIDE_START + 255) #define SID_SVX_START SID_LIB_START // 10000 #define SID_SVX_END (SID_SVX_START + 1499) @@ -311,7 +214,7 @@ #define SID_DBACCESS_START (SID_SBA_END + 1) // 12251 #define SID_DBACCESS_END (SID_DBACCESS_START + 200) #define SID_RPTUI_START (SID_DBACCESS_END + 1) // 12452 -#define SID_RPTUI_END (SID_RPTUI_START + 199) +// SID_RPTUI_END (SID_RPTUI_START + 199) #endif diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc index 2ac8213bb704..b40524a259fc 100644 --- a/svl/inc/svl/svl.hrc +++ b/svl/inc/svl/svl.hrc @@ -61,10 +61,6 @@ #define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+28) #define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+29) #define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+30) -#define STR_SVT_MIMETYPE_APP_SCHED_CMB (STR_SVT_MIMETYPE_START+31) -#define STR_SVT_MIMETYPE_APP_SCHED_EVT (STR_SVT_MIMETYPE_START+32) -#define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+33) -#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW (STR_SVT_MIMETYPE_START+34) #define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+35) #define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+36) diff --git a/svtools/inc/svtools/controldims.hrc b/svtools/inc/svtools/controldims.hrc index 5e26f132897d..138782d70051 100644 --- a/svtools/inc/svtools/controldims.hrc +++ b/svtools/inc/svtools/controldims.hrc @@ -71,8 +71,6 @@ #define RSC_SP_FLGR_SPACE_Y 4 #define RSC_SP_GRP_SPACE_X 6 // between groupings made with GroupBox #define RSC_SP_GRP_SPACE_Y 6 -#define RSC_SP_TXT_SPACE_X 5 // spacing between text paragraphs -#define RSC_SP_TXT_SPACE_Y 7 #define RSC_SP_CHK_TEXTINDENT 8 // x indent of text aligned to checkbox title // dialog inner border @@ -97,6 +95,5 @@ #define RSC_SP_GRP_INNERBORDER_LEFT 6 // for GroupBox groupings #define RSC_SP_GRP_INNERBORDER_TOP 6 #define RSC_SP_GRP_INNERBORDER_RIGHT 6 -#define RSC_SP_GRP_INNERBORDER_BOTTOM 6 #endif // _SVT_CONTROLDIMS_HRC_ diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 530b3694022b..38c744439804 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -28,7 +28,6 @@ #ifndef _SVT_HELPID_HRC #define _SVT_HELPID_HRC -#define HID_FILEDLG_OPENDLG "SVT_HID_FILEDLG_OPENDLG" #define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG" #define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR" #define HID_FILEDLG_EDIT "SVT_HID_FILEDLG_EDIT" @@ -38,10 +37,6 @@ #define HID_FILEDLG_NEWDIR "SVT_HID_FILEDLG_NEWDIR" #define HID_FILEDLG_HOME "SVT_HID_FILEDLG_HOME" #define HID_FILEDLG_FILE "SVT_HID_FILEDLG_FILE" -#define HID_FILEDLG_FILES "SVT_HID_FILEDLG_FILES" -#define HID_FILEDLG_PATH "SVT_HID_FILEDLG_PATH" -#define HID_FILEDLG_TYPE "SVT_HID_FILEDLG_TYPE" -#define HID_FILEDLG_TYPES "SVT_HID_FILEDLG_TYPES" #define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" #define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" #define HID_FILEDLG_STANDARD "SVT_HID_FILEDLG_STANDARD" @@ -59,11 +54,8 @@ #define HID_FILEDLG_FOLDER_BTN "SVT_HID_FILEDLG_FOLDER_BTN" #define HID_FILEDLG_FOLDER_FILENAME "SVT_HID_FILEDLG_FOLDER_FILENAME" #define HID_FILEDLG_SRCHFOLDER_BTN "SVT_HID_FILEDLG_SRCHFOLDER_BTN" -#define HID_FILEDLG_EDIT_FAVORITES "SVT_HID_FILEDLG_EDIT_FAVORITES" -#define HID_FILEDLG_NEW_FAVORITE "SVT_HID_FILEDLG_NEW_FAVORITE" #define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SVT_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" #define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SVT_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" -#define HID_FILEDLG_EXPORTASPDF "SVT_HID_FILEDLG_EXPORTASPDF" // HelpID's fuer die Textkomponente #define HID_TEXTCPNT_OPEN_LINK "SVT_HID_TEXTCPNT_OPEN_LINK" @@ -72,9 +64,6 @@ #define HID_TEXTCPNT_ADD_BOOKMARK "SVT_HID_TEXTCPNT_ADD_BOOKMARK" #define HID_TEXTCPNT_COPY_LINK "SVT_HID_TEXTCPNT_COPY_LINK" -// HelpID's fuer RegisterDialog -#define HID_LIMITED_DIALOG "SVT_HID_LIMITED_DIALOG" - // Help ids of template dialog #define HID_TEMPLATEDLG_DIALOG "SVT_HID_TEMPLATEDLG_DIALOG" #define HID_TEMPLATEDLG_ICONCTRL "SVT_HID_TEMPLATEDLG_ICONCTRL" diff --git a/svtools/inc/svtools/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc index 31ab1b75a7d5..2d024134cfbb 100644 --- a/svtools/inc/svtools/imagemgr.hrc +++ b/svtools/inc/svtools/imagemgr.hrc @@ -51,7 +51,6 @@ #define IMG_SIM (IMAGELIST_START + 79) #define IMG_TEXTFILE (IMAGELIST_START + 80) #define IMG_TIFF (IMAGELIST_START + 82) -#define IMG_URL (IMAGELIST_START + 83) #define IMG_WMF (IMAGELIST_START + 84) #define IMG_WRITER (IMAGELIST_START + 86) #define IMG_WRITERTEMPLATE (IMAGELIST_START + 87) @@ -70,7 +69,6 @@ #define IMG_GLOBAL_DOC (IMAGELIST_START + 150) #define IMG_DRAW (IMAGELIST_START + 151) #define IMG_DRAWTEMPLATE (IMAGELIST_START + 152) -#define IMG_NEWFROMTEMPLATE (IMAGELIST_START + 166) #define IMG_OO_DATABASE_DOC (IMAGELIST_START + 169) #define IMG_OO_DRAW_DOC (IMAGELIST_START + 170) #define IMG_OO_MATH_DOC (IMAGELIST_START + 171) diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index 541accd25e1d..945ad4ab988c 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -35,8 +35,6 @@ //............................................................................. // various unsorted stuff -#define DLG_TWAIN_SOURCE (RID_SVTOOLS_START+3) - #define DLG_SVT_QUERYDELETE (RID_SVTOOLS_START+6) #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) @@ -44,7 +42,6 @@ #define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20) #define STR_SVT_FILEVIEW_COLUMN_SIZE (RID_SVTOOLS_START + 21) #define STR_SVT_FILEVIEW_COLUMN_DATE (RID_SVTOOLS_START + 22) -#define STR_SVT_FOLDER (RID_SVTOOLS_START + 23) #define STR_SVT_FILEVIEW_ERR_MAKEFOLDER (RID_SVTOOLS_START + 24) #define STR_SVT_BYTES (RID_SVTOOLS_START + 25) #define STR_SVT_KB (RID_SVTOOLS_START + 26) @@ -69,39 +66,17 @@ #define STR_SVT_TEMPLATES_HELP (RID_SVTOOLS_START+65) #define STR_SVT_SAMPLES_HELP (RID_SVTOOLS_START+66) -#define STR_WARNING_ITEM (RID_SVTOOLS_START+90) - -#define CONFIG_BASIC_FORMAT_START (RID_SVTOOLS_START+102) #define STR_BASICKEY_FORMAT_ON (RID_SVTOOLS_START+103) #define STR_BASICKEY_FORMAT_OFF (RID_SVTOOLS_START+104) #define STR_BASICKEY_FORMAT_YES (RID_SVTOOLS_START+105) #define STR_BASICKEY_FORMAT_NO (RID_SVTOOLS_START+106) #define STR_BASICKEY_FORMAT_TRUE (RID_SVTOOLS_START+107) #define STR_BASICKEY_FORMAT_FALSE (RID_SVTOOLS_START+108) -#define CONFIG_BASIC_FORMAT_END (RID_SVTOOLS_START+109) #define STR_UNDO (RID_SVTOOLS_START+110) #define STR_REDO (RID_SVTOOLS_START+111) #define STR_REPEAT (RID_SVTOOLS_START+112) - -#define STR_INVALIDTRYBUY (RID_SVTOOLS_START+120) -#define STR_OLDTRYBUY (RID_SVTOOLS_START+121) -#define STR_TRYBUY (RID_SVTOOLS_START+122) -#define STR_PVER_LANGUAGECODE (RID_SVTOOLS_START+124) -#define STR_PVER_LONG_LANGUAGECODE (RID_SVTOOLS_START+125) -#define STR_INVALIDPUFF (RID_SVTOOLS_START+126) -#define STR_LIMITEDPUFF (RID_SVTOOLS_START+127) -#define STR_OLDLIMITEDPUFF (RID_SVTOOLS_START+128) #define STR_BASICKEY_FORMAT_CURRENCY (RID_SVTOOLS_START+130) -#define STR_KEYERR_GENERAL_HELP (RID_SVTOOLS_START+131) -#define STR_KEYERR_INVALID_KEY (RID_SVTOOLS_START+132) -#define STR_KEYERR_INVALID_USERDATA (RID_SVTOOLS_START+133) -#define STR_KEYERR_INVALID_ADDRESSDATA (RID_SVTOOLS_START+134) -#define STR_KEYERR_INVALID_LICENSE (RID_SVTOOLS_START+135) -#define STR_KEYERR_INVALID_LANGUAGE (RID_SVTOOLS_START+136) -#define STR_KEYERR_INVALID_OS (RID_SVTOOLS_START+137) -#define STR_KEYERR_INVALID_NO_CNR (RID_SVTOOLS_START+138) -#define STR_KEYERR_INVALID_CNR (RID_SVTOOLS_START+139) #define STR_SVT_PRNDLG_START (RID_SVTOOLS_START+141) #define DLG_SVT_PRNDLG_PRNSETUPDLG (STR_SVT_PRNDLG_START+0) @@ -143,22 +118,6 @@ #define STR_SVT_CALENDAR_END (STR_SVT_CALENDAR_NONE) #define STR_SVT_PVER_START (STR_SVT_CALENDAR_END+1) -#define STR_SVT_PVER_INTERNAL (STR_SVT_PVER_START+0) -#define STR_SVT_PVER_PERSONAL_DELUXE (STR_SVT_PVER_START+1) -#define STR_SVT_PVER_PERSONAL (STR_SVT_PVER_START+2) -#define STR_SVT_PVER_PROFESSIONAL (STR_SVT_PVER_START+3) -#define STR_SVT_PVER_BUSINESS (STR_SVT_PVER_START+4) -#define STR_SVT_PVER_ENTERPRICE (STR_SVT_PVER_START+5) -#define STR_SVT_PVER_EDUCATION (STR_SVT_PVER_START+6) -#define STR_SVT_PVER_DEMO (STR_SVT_PVER_START+7) -#define STR_SVT_PVER_BETA (STR_SVT_PVER_START+8) -#define STR_SVT_PVER_OEM (STR_SVT_PVER_START+9) -#define STR_SVT_PVER_NOT_REGISTERED (STR_SVT_PVER_START+10) -#define STR_SVT_PVER_PILOT (STR_SVT_PVER_START+11) -#define STR_SVT_PVER_CAMPUS (STR_SVT_PVER_START+12) -#define STR_SVT_PVER_EVALUATION (STR_SVT_PVER_START+13) -#define STR_SVT_PVER_PARTNER (STR_SVT_PVER_START+14) -#define STR_SVT_PVER_SMALLBUSINESS (STR_SVT_PVER_START+15) #define STR_SVT_PVER_OEM_PROFESSIONAL (STR_SVT_PVER_START+16) #define STR_SVT_PVER_END (STR_SVT_PVER_OEM_PROFESSIONAL) @@ -221,8 +180,6 @@ #define STR_SVT_ACC_DESC_FILE (STR_SVT_ACC_BEGIN+5) #define STR_SVT_ACC_EMPTY_FIELD (STR_SVT_ACC_BEGIN+6) //IAccessible2 implementation -#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE (STR_SVT_ACC_BEGIN+7) -#define STR_SVT_ACC_RULER_VERT_NAME (STR_SVT_ACC_BEGIN+8) #define STR_SVT_ACC_RULER_HORZ_NAME (STR_SVT_ACC_BEGIN+9) #define STR_SVT_ACC_END (STR_SVT_ACC_RULER_HORZ_NAME) @@ -263,17 +220,13 @@ #define DLG_EXPORT_START (STR_ARR_SVT_LANGUAGE_TABLE_END + 1) #define DLG_EXPORT (DLG_EXPORT_START) #define DLG_EXPORT_TITLE (DLG_EXPORT_START+1) -#define DLG_EXPORT_END (DLG_EXPORT_TITLE) #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) -#define DLG_REGISTRATION_REQUEST (RID_SVTOOLS_START+115) - //............................................................................. // bitmaps -#define BMP_DEMO_FINGER (RID_SVTOOLS_BITMAP_START + 0) #define BMP_HELP_AGENT_IMAGE (RID_SVTOOLS_BITMAP_START + 1) #define BMP_HELP_AGENT_CLOSER (RID_SVTOOLS_BITMAP_START + 2) #define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 3) @@ -286,11 +239,6 @@ #define RID_SVTOOLS_IMAGELIST_SMALL (RID_SVTOOLS_IMAGELIST_START + 2) #define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX (RID_SVTOOLS_IMAGELIST_START + 3) -//............................................................................. -// error boxes -#define ERRBOX_REG_NOSYSBROWSER ( RID_SVTOOLS_START + 0 ) -#define ERRBOX_CHECK_PLZ ( RID_SVTOOLS_START + 11 ) - // Java message boxes //These strings come from project desktop //There was no time for translation, therefore the defines needed to @@ -338,7 +286,6 @@ // IAccessible2 implementation in 2009 #define STR_PARAGRAPH_START (STR_SVT_PRNDLG_START + 50) #define STR_PARAGRAPH (STR_PARAGRAPH_START + 0) -#define STR_PARAGRAPH_END (STR_PARAGRAPH) #endif // #ifndef _SVTOOLS_HRC diff --git a/svtools/source/contnr/templwin.hrc b/svtools/source/contnr/templwin.hrc index 5a0d84f1d377..aa7c355a98d4 100644 --- a/svtools/source/contnr/templwin.hrc +++ b/svtools/source/contnr/templwin.hrc @@ -41,7 +41,6 @@ #define TI_DOCTEMPLATE_DOCINFO 4 #define TI_DOCTEMPLATE_PREVIEW 5 -#define HBI_CATEGORY 1 #define DI_TITLE 1 #define DI_FROM 2 diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 7230df0c6da6..8a7214d3ae97 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -28,7 +28,6 @@ #define _SVX_FMHELP_HRC // Help-Ids -------------------------------------------------------------- -#define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG" #define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" #define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" #define HID_FIELD_SEL "SVX_HID_FIELD_SEL" diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index e1f334ed66ab..2dced47a16ce 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -92,72 +92,30 @@ #define BTN_CANCEL 1 #define BTN_HELP 1 -#define CTL_GALLERY 1 -#define FL_THEMELIST 2 -#define LBX_THEMELIST 1 #define FL_INFO 1 #define FT_SIZE 1 #define FT_DEPTH 2 -#define FT_MEMSIZE 3 #define FT_FORMAT 4 -#define FT_CLIPART 5 -#define FT_BMPSIZE 6 -#define FT_BMPDEPTH 7 -#define FT_BMPMEM 8 -#define FT_BMPFORMAT 9 -#define BTN_BROWSER 1 -#define FL_THEME 1 -#define FL_PATH 4 -#define FL_FOUND 2 -#define FL_THEMEFILES 3 -#define EDT_PATH 1 -#define EDT_FILETYPE 1 #define LBX_FOUND 1 -#define LBX_THEMEFILES 2 #define BTN_TAKE 5 -#define BTN_CLEAR 6 -#define BTN_NEWTHEME 2 #define BTN_IMPORT 5 -#define BTN_CLEARTHEME 3 -#define BTN_RENAMETHEME 7 #define BTN_PATH 1 #define BTN_SEARCH 4 -#define CBX_SUBDIRS 1 -#define CBX_TAKEALL 2 #define CBX_PREVIEW 3 -#define CBX_CLEARALL 3 #define FT_PATH 1 #define FT_FILETYPE 2 #define CBB_FILETYPE 1 -#define BTN_CLEARTHEMEFILE 6 -#define CTL_BROWSER 1 -#define FL_BROWSER 1 -#define FL_DRIVES 2 -#define LBX_DRIVE 1 -#define EDT_NEWTHEME 1 #define FL_SEARCH_DIR 1 #define FL_SEARCH_TYPE 2 #define FT_SEARCH_DIR 1 #define FT_SEARCH_TYPE 2 #define FL_TAKE_PROGRESS 1 #define FT_TAKE_FILE 1 -#define EDT_RENAMETHEME 1 #define BTN_ADD 2 -#define CBX_LINKAGE 1 #define WND_PREVIEW 1 -#define FT_FOUND 1 #define BTN_TAKEALL 1 #define BTN_PREVIEW 6 #define WND_BRSPRV 1 -#define BTN_THEME 2 -#define BTN_RECOVER 3 -#define BTN_CLOSEBROWSER 7 -#define LBX_THEME2 1 -#define FL_THEME2 1 -#define BTN_NEWTHEME2 1 -#define BTN_RENAMETHEME2 3 -#define BTN_CLEARTHEME2 2 -#define BTN_CLOSETHEME 4 #define MN_ADDMENU 2 #define MN_ADD 6 #define MN_ADD_LINK 8 @@ -168,7 +126,6 @@ #define MN_COPYCLIPBOARD 16 #define MN_PASTECLIPBOARD 17 -#define MN_NEWTHEME 20 #define MN_ACTUALIZE 21 #define MN_RENAME 22 #define MN_PROPERTIES 23 @@ -177,15 +134,12 @@ #define FL_ACTUALIZE_PROGRESS 1 #define FT_ACTUALIZE_FILE 1 #define FL_ID 1 -#define MTF_ID 1 #define LB_RESNAME 1 -#define BTN_RESNAME 1 #define EDT_TITLE 20 #define FL_TITLE 21 // Gallery-TabDialog #define FI_MS_IMAGE 1 -#define FT_MS_NAME 1 #define EDT_MS_NAME 1 #define FL_MS_GENERAL_FIRST 1 #define FT_MS_TYPE 2 diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index be75fe019f96..d4500fbba64e 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -40,7 +40,6 @@ #define HID_CONTDLG_APPLY "SVX_HID_CONTDLG_APPLY" #define HID_CONTDLG_AUTOCONTOUR "SVX_HID_CONTDLG_AUTOCONTOUR" #define HID_CONTDLG_CIRCLE "SVX_HID_CONTDLG_CIRCLE" -#define HID_CONTDLG_FREEPOLY "SVX_HID_CONTDLG_FREEPOLY" #define HID_CONTDLG_GRAPHWND "SVX_HID_CONTDLG_GRAPHWND" #define HID_CONTDLG_PIPETTE "SVX_HID_CONTDLG_PIPETTE" #define HID_CONTDLG_POLY "SVX_HID_CONTDLG_POLY" @@ -159,10 +158,6 @@ #define HID_PASSWORD "SVX_HID_PASSWORD" #define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR" #define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL" -#define HID_POPUP_EXTRUSION_DEPTH "SVX_HID_POPUP_EXTRUSION_DEPTH" -#define HID_POPUP_EXTRUSION_DIRECTION "SVX_HID_POPUP_EXTRUSION_DIRECTION" -#define HID_POPUP_EXTRUSION_LIGHTING "SVX_HID_POPUP_EXTRUSION_LIGHTING" -#define HID_POPUP_EXTRUSION_SURFACE "SVX_HID_POPUP_EXTRUSION_SURFACE" #define HID_POPUP_FONTWORK_ALIGN "SVX_HID_POPUP_FONTWORK_ALIGN" #define HID_POPUP_FONTWORK_CHARSPACE "SVX_HID_POPUP_FONTWORK_CHARSPACE" #define HID_POPUP_FRAME "SVX_HID_POPUP_FRAME" @@ -199,7 +194,6 @@ #define HID_REDLINING_VIEW_PB_UNDO "SVX_HID_REDLINING_VIEW_PB_UNDO" #define HID_RUBY_DIALOG "SVX_HID_RUBY_DIALOG" #define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" -#define HID_SVXTBX_ALIGNMENT "SVX_HID_SVXTBX_ALIGNMENT" #define HID_SVXTBX_DRAW "SVX_HID_SVXTBX_DRAW" #define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL" #define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE" @@ -223,8 +217,6 @@ #define HID_VALUESET_EXTRUSION_DIRECTION "SVX_HID_VALUESET_EXTRUSION_DIRECTION" #define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" -#define HID_WIN_FONTWORK_ALIGN "SVX_HID_WIN_FONTWORK_ALIGN" -#define HID_WIN_FONTWORK_CHARSPACE "SVX_HID_WIN_FONTWORK_CHARSPACE" #define HID_XMLSEC_CALL "SVX_HID_XMLSEC_CALL" #define HID_OFA_HYPERLINK_DLG "SVX_HID_OFA_HYPERLINK_DLG" #define HID_OFA_HYPERLINK_NAME "SVX_HID_OFA_HYPERLINK_NAME" @@ -232,51 +224,6 @@ #define HID_OFA_HYPERLINK_TARGET "SVX_HID_OFA_HYPERLINK_TARGET" #define HID_OFA_HYPERLINK_URL "SVX_HID_OFA_HYPERLINK_URL" #define HID_OFA_HYPERLINK_URL_TXT "SVX_HID_OFA_HYPERLINK_URL_TXT" -#define HID_AUTOCORR_DLG "SVX_HID_AUTOCORR_DLG" -#define HID_SVXCTL_MAIL_ATTACH "SVX_HID_SVXCTL_MAIL_ATTACH" -#define HID_SVXDLG_REGISTRATION "SVX_HID_SVXDLG_REGISTRATION" -#define HID_SVXDLG_TREE_BASE "SVX_HID_SVXDLG_TREE_BASE" -#define HID_SVXDLG_TREE_CHART "SVX_HID_SVXDLG_TREE_CHART" -#define HID_SVXDLG_TREE_FILTER "SVX_HID_SVXDLG_TREE_FILTER" -#define HID_SVXDLG_TREE_LANGUAGE "SVX_HID_SVXDLG_TREE_LANGUAGE" -#define HID_SVXWIN_MAIL_ATTACH "SVX_HID_SVXWIN_MAIL_ATTACH" -#define HID_SVXWIN_MAIL_HEADER "SVX_HID_SVXWIN_MAIL_HEADER" -#define HID_SVX_DLGFORMNEW "SVX_HID_SVX_DLGFORMNEW" -#define HID_SVX_DLGTABNEW "SVX_HID_SVX_DLGTABNEW" -#define HID_SVX_HYPERLINK "SVX_HID_SVX_HYPERLINK" -#define HID_SVX_MAILATTACH_ASCII_CB "SVX_HID_SVX_MAILATTACH_ASCII_CB" -#define HID_SVX_MAILATTACH_HTML_CB "SVX_HID_SVX_MAILATTACH_HTML_CB" -#define HID_SVX_MAILATTACH_OFFICE_CB "SVX_HID_SVX_MAILATTACH_OFFICE_CB" -#define HID_SVX_MAILATTACH_PRIORITY_LB "SVX_HID_SVX_MAILATTACH_PRIORITY_LB" -#define HID_SVX_MAILATTACH_RECEIPT_CB "SVX_HID_SVX_MAILATTACH_RECEIPT_CB" -#define HID_SVX_MAILATTACH_RTF_CB "SVX_HID_SVX_MAILATTACH_RTF_CB" -#define HID_SVX_MAILHEAD_HEAD_WIN "SVX_HID_SVX_MAILHEAD_HEAD_WIN" -#define HID_SVX_MAILHEAD_PRIORITY_LB "SVX_HID_SVX_MAILHEAD_PRIORITY_LB" -#define HID_SVX_MAILHEAD_PROTOCOL_LB "SVX_HID_SVX_MAILHEAD_PROTOCOL_LB" -#define HID_SVX_MAILHEAD_RCPT_CB "SVX_HID_SVX_MAILHEAD_RCPT_CB" -#define HID_SVX_MAILHEAD_RCPT_ED "SVX_HID_SVX_MAILHEAD_RCPT_ED" -#define HID_SVX_MAILHEAD_RCPT_LB "SVX_HID_SVX_MAILHEAD_RCPT_LB" -#define HID_SVX_MAILHEAD_RECEIPT_CB "SVX_HID_SVX_MAILHEAD_RECEIPT_CB" -#define HID_SVX_MAILHEAD_ROLE_LB "SVX_HID_SVX_MAILHEAD_ROLE_LB" -#define HID_SVX_MAILHEAD_SUBJECT_ED "SVX_HID_SVX_MAILHEAD_SUBJECT_ED" -#define HID_SVX_MAILMENU_ADDADDRESS "SVX_HID_SVX_MAILMENU_ADDADDRESS" -#define HID_SVX_MAILMENU_COPYLINK "SVX_HID_SVX_MAILMENU_COPYLINK" -#define HID_SVX_MAILMENU_DELETE "SVX_HID_SVX_MAILMENU_DELETE" -#define HID_SVX_MAILMENU_FILE "SVX_HID_SVX_MAILMENU_FILE" -#define HID_SVX_MAILMENU_OPEN "SVX_HID_SVX_MAILMENU_OPEN" -#define HID_SVX_MAILMENU_RENAME "SVX_HID_SVX_MAILMENU_RENAME" -#define HID_SVX_MAILMENU_SAVEAS "SVX_HID_SVX_MAILMENU_SAVEAS" -#define HID_SVX_MAILMENU_SIG1 "SVX_HID_SVX_MAILMENU_SIG1" -#define HID_SVX_MAILMENU_SIG2 "SVX_HID_SVX_MAILMENU_SIG2" -#define HID_SVX_MAILMENU_SIG3 "SVX_HID_SVX_MAILMENU_SIG3" -#define HID_SVX_MAILMENU_SIG4 "SVX_HID_SVX_MAILMENU_SIG4" -#define HID_SVX_MAILTOOLBOX "SVX_HID_SVX_MAILTOOLBOX" -#define HID_SVX_SENDMENU_ENCRYPT "SVX_HID_SVX_SENDMENU_ENCRYPT" -#define HID_SVX_SENDMENU_PLAIN "SVX_HID_SVX_SENDMENU_PLAIN" -#define HID_SVX_SENDMENU_SIGN "SVX_HID_SVX_SENDMENU_SIGN" -#define HID_SVX_SENDMENU_SIGNANDENCRYPT "SVX_HID_SVX_SENDMENU_SIGNANDENCRYPT" -#define HID_SVX_TP_APPEARANCE "SVX_HID_SVX_TP_APPEARANCE" -#define HID_SVX_TP_DESKTOP "SVX_HID_SVX_TP_DESKTOP" #define HID_CT_THES_ALTERNATIVES "SVX_HID_CT_THES_ALTERNATIVES" #endif diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 008dcb832f17..5f4fabd36ab6 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -903,7 +903,6 @@ #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE (RID_SVX_START + 1118) #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT (RID_SVX_START + 1119) #define RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT (RID_SVX_START + 1120) -#define RID_SVXSTR_UNDO_APPLY_FONTWORK_KERN_CHARACTER_PAIRS (RID_SVX_START + 1121) #define RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING (RID_SVX_START + 1122) #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF (RID_SVX_START + 1123) #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN (RID_SVX_START + 1124) diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc index e47aeb63f96e..2c89a7b3fb2d 100644 --- a/svx/inc/svx/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc @@ -70,7 +70,6 @@ #define RID_SVXIMG_NAVIGATIONBAR SID_FM_NAVIGATIONBAR // Dialog-Id's ----------------------------------------------------------- -#define TBX_FORM (RID_FORMS_START + 2) #define RID_SVXDLG_SETFORM (RID_FORMS_START + 5) #define RID_SVX_FMEXPLORER (RID_FORMS_START + 6) #define RID_SVXDLG_ADD_DATAITEM (RID_FORMS_START + 12) diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 07b8dd7720bb..1d95a2c64764 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -60,9 +60,7 @@ #define MID_FIRSTLINE_OFFSET 0x2d #define MID_FONTFAMILY 0x2f #define MID_FONTFAMILYNAME 0x30 -#define MID_FONTPITCH 0x31 #define MID_FONTSTYLE 0x32 -#define MID_PERCENT 0x33 #define MID_HYPHEN 0x34 #define MID_INTER_LINESPACE 0x36 #define MID_INTER_SPACE 0x37 @@ -85,35 +83,12 @@ #define MID_UPPER 0x4b #define MID_USExxx 0x4c -#define MID_ADR_CITY 0x50 -#define MID_ADR_COMPANY 0x51 -#define MID_ADR_COUNTRY 0x52 -#define MID_ADR_EMAIL 0x53 -#define MID_ADR_FAX 0x54 -#define MID_ADR_FIRSTNAME 0x55 -#define MID_ADR_ID 0x56 -#define MID_ADR_LASTNAME 0x57 -#define MID_ADR_PHONE 0x58 -#define MID_ADR_PHONEPRIVATE 0x59 -#define MID_ADR_POSITION 0x5a -#define MID_ADR_STREET 0x5b -#define MID_ADR_TITLE 0x5c -#define MID_ADR_ZIPCODE 0x5d -#define MID_ADR_STATE 0x5e - -#define MID_FILENAME 0x6c -#define MID_FILTERNAME 0x6d -#define MID_POSITION 0x6e - #define MID_HLINK_NAME 0x6f #define MID_HLINK_URL 0x70 #define MID_HLINK_TARGET 0x71 #define MID_HLINK_TYPE 0x72 #define MID_HLINK_TEXT 0x73 -#define MID_COUNT 0x74 -#define MID_READONLY 0x76 - #define MID_VIEWLAYOUT_COLUMNS 0x77 #define MID_VIEWLAYOUT_BOOKMODE 0x78 @@ -122,66 +97,6 @@ #define MID_ZOOMSLIDER_MINZOOM 0x7b #define MID_ZOOMSLIDER_MAXZOOM 0x7c -#define MID_ADR_FATHERSNAME 0x80 -#define MID_ADR_APARTMENT 0x81 - - -// -------------------------------------------------------------------------- -// Resource-Id's ? (obsolete??? at least the one beginning with SID???) -// -------------------------------------------------------------------------- -/* -#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) -#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206) -#define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207) -#define RID_SW_TP_STD_FONT (RID_OFA_START + 208) -#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209) -#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210) -#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211) -#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212) -#define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213) -#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214) -#define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215) -#define RID_SW_TP_OPTSRCVIEW (RID_OFA_START + 216) -#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217) -#define SID_SC_TP_LAYOUT (RID_OFA_START + 218) -#define SID_SC_TP_CONTENT (RID_OFA_START + 219) -#define SID_SC_TP_INPUT (RID_OFA_START + 220) -#define SID_SC_TP_GRID (RID_OFA_START + 221) -#define SID_SC_TP_USERLISTS (RID_OFA_START + 222) -#define SID_SC_TP_CALC (RID_OFA_START + 223) -#define SID_SC_TP_CHANGES (RID_OFA_START + 224) -#define SID_SC_TP_CHANGES (RID_OFA_START + 224) -#define SID_SD_TP_CONTENTS (RID_OFA_START + 225) -#define SID_SD_TP_LAYOUT (RID_OFA_START + 226) -#define SID_SD_TP_SNAP (RID_OFA_START + 227) -#define SID_SD_TP_SCALE (RID_OFA_START + 228) -#define SID_SD_TP_GRID (RID_OFA_START + 229) -#define SID_SD_TP_PRINT (RID_OFA_START + 220) -#define SID_SD_TP_MISC (RID_OFA_START + 231) -#define SID_SI_TP_CONTENTS (RID_OFA_START + 232) -#define SID_SI_TP_LAYOUT (RID_OFA_START + 233) -#define SID_SI_TP_SNAP (RID_OFA_START + 234) -#define SID_SI_TP_GRID (RID_OFA_START + 235) -#define SID_SI_TP_PRINT (RID_OFA_START + 236) -#define SID_SI_TP_MISC (RID_OFA_START + 237) -#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238) -#define SID_SC_TP_MISC (RID_OFA_START + 239) -#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240) -#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241) -#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242) -#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243) -#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244) -#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246) -#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247) -#define RID_SC_TP_PRINT (RID_OFA_START + 248) -#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251) -#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // 4 SC & ID 4 resource -#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) // 4 SD -#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress -*/ - -#define SID_ATTR_PARENTWINDOW (RID_OFA_START + 255) - // -------------------------------------------------------------------------- // Event-Id's Block 1 // -------------------------------------------------------------------------- @@ -202,7 +117,6 @@ // Function-Id's #define FID_SVX_START (SID_LIB_START + 500) -#define FID_SVX_END (SID_LIB_START + 509) #define FID_SEARCH_ON (FID_SVX_START + 0) #define FID_SEARCH_OFF (FID_SVX_START + 1) @@ -258,7 +172,6 @@ #define SID_BASICIDE_ARG_TABID ( SID_BASICIDE_START + 30 ) #define SID_BASICIDE_ARG_SBX ( SID_BASICIDE_START + 31 ) #define SID_BASICIDE_ARG_MACROINFO ( SID_BASICIDE_START + 32 ) -#define SID_BASICIDE_ARG_SEARCHOPTIONS ( SID_BASICIDE_START + 33 ) #define SID_BASICIDE_ARG_LIBNAME ( SID_BASICIDE_START + 34 ) #define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 ) #define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 ) @@ -277,13 +190,6 @@ #define SID_SBA_BRW_UPDATE (SID_SBA_START+100) // Daten in Felder #define SID_SBA_BRW_INSERT (SID_SBA_START+101) // Daten in Text #define SID_SBA_BRW_MERGE (SID_SBA_START+102) // Serienbrief -#define SID_SBA_CLEAR_QUERY (SID_SBA_START+130) -#define SID_SBA_ADD_RELATION (SID_SBA_START+131) // im Relationenentwurf neue Relation -#define SID_SBA_QUERY_VIEW_FUNCTIONS (SID_SBA_START+134) -#define SID_SBA_QUERY_VIEW_TABLES (SID_SBA_START+135) -#define SID_SBA_QUERY_VIEW_ALIASES (SID_SBA_START+136) -#define SID_SBA_QUERY_DISTINCT_VALUES (SID_SBA_START+137) -#define SID_SBA_QRY_DESIGN (SID_SBA_START+120) // -------------------------------------------------------------------------- // SD-Id's @@ -360,7 +266,6 @@ #define SID_FRAME_UP (SID_SC_START + 407) #define SID_FRAME_DOWN (SID_SC_START + 408) #define SID_ENTER_STRING (SID_SC_START + 476) -#define SID_ATTR_SECIALCHAR (SID_SC_START + 581) #define SID_ATTR_SPECIALCHAR (SID_SC_START + 581) //! moved to sfx2, still in use: @@ -384,7 +289,6 @@ //!! be aware to not overwrite something that is used in sw/inc/cmdid.h already !! #define FN_FORMAT (SID_SW_START + 400) -#define FN_SET_JUSTIFY_PARA (FN_FORMAT + 21) #define FN_FORMAT_RESET (FN_FORMAT + 69) #define FN_EXTRA (SID_SW_START + 600) @@ -430,14 +334,6 @@ #define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 61 ) #define SID_ATTR_PAGE_SHARED ( SID_SVX_START + 62 ) #define SID_ATTR_PAGE_BSP ( SID_SVX_START + 63 ) -#define SID_ATTR_DBSESS_SERVERTYPE ( SID_SVX_START + 70 ) -#define SID_ATTR_DBSESS_SERVEROPTS ( SID_SVX_START + 71 ) -#define SID_ATTR_DBSESS_USERNAME ( SID_SVX_START + 72 ) -#define SID_ATTR_DBSESS_PASSWORD ( SID_SVX_START + 73 ) -#define SID_ATTR_DBSESS_SAVESESS ( SID_SVX_START + 74 ) -#define SID_ATTR_DBSESS_SAVEUSER ( SID_SVX_START + 75 ) -#define SID_ATTR_DBSESS_SERVERNAME ( SID_SVX_START + 76 ) -#define SID_ATTR_DBSESS_ENABLETYPE ( SID_SVX_START + 77 ) #define SID_ATTR_NUMBERFORMAT_VALUE ( SID_SVX_START + 85 ) #define SID_ATTR_NUMBERFORMAT_INFO ( SID_SVX_START + 86 ) #define SID_ATTR_TRANSFORM ( SID_SVX_START + 87 ) @@ -465,17 +361,10 @@ #define SID_DRAW_XLINE ( SID_SVX_START + 103 ) #define SID_DRAW_RECT ( SID_SVX_START + 104 ) #define SID_DRAW_RECT_ROUND ( SID_SVX_START + 105 ) -#define SID_DRAW_RECT_MOREROUND ( SID_SVX_START + 106 ) -#define SID_DRAW_FULLRECT ( SID_SVX_START + 107 ) -#define SID_DRAW_FULLRECT_ROUND ( SID_SVX_START + 108 ) -#define SID_DRAW_FULLRECT_MOREROUND ( SID_SVX_START + 109 ) #define SID_DRAW_ELLIPSE ( SID_SVX_START + 110 ) -#define SID_DRAW_FULLELLIPSE ( SID_SVX_START + 111 ) #define SID_DRAW_PIE ( SID_SVX_START + 112 ) -#define SID_DRAW_FULLPIE ( SID_SVX_START + 113 ) #define SID_DRAW_ARC ( SID_SVX_START + 114 ) #define SID_DRAW_CIRCLECUT ( SID_SVX_START + 115 ) -#define SID_DRAW_FULLCIRCLECUT ( SID_SVX_START + 116 ) #define SID_DRAW_POLYGON ( SID_SVX_START + 117 ) #define SID_DRAW_BEZIER_FILL ( SID_SVX_START + 118 ) #define SID_BEZIER_INSERT ( SID_SVX_START + 119 ) @@ -484,7 +373,6 @@ #define SID_BEZIER_CLOSE ( SID_SVX_START + 122 ) #define SID_BEZIER_SMOOTH ( SID_SVX_START + 123 ) #define SID_BEZIER_APPEND ( SID_SVX_START + 124 ) -#define SID_BEZIER_OPEN ( SID_SVX_START + 125 ) #define SID_BEZIER_EDIT ( SID_SVX_START + 126 ) #define SID_BEZIER_CUTLINE ( SID_SVX_START + 127 ) #define SID_OBJECT_SELECT ( SID_SVX_START + 128 ) @@ -496,20 +384,15 @@ #define SID_OBJECT_ALIGN_UP ( SID_SVX_START + 134 ) #define SID_OBJECT_ALIGN_MIDDLE ( SID_SVX_START + 135 ) #define SID_OBJECT_ALIGN_DOWN ( SID_SVX_START + 136 ) -#define SID_COPY_FORMAT ( SID_SVX_START + 137 ) -#define SID_PASTE_FORMAT ( SID_SVX_START + 138 ) -#define SID_INSERT_ORGANIGRAM ( SID_SVX_START + 139 ) #define SID_INSERT_DIAGRAM ( SID_SVX_START + 140 ) #define SID_DRAW_CHART SID_INSERT_DIAGRAM #define SID_INSERT_TABLE ( SID_SVX_START + 141 ) #define SID_ATTRIBUTES_AREA ( SID_SVX_START + 142 ) #define SID_ATTRIBUTES_LINE ( SID_SVX_START + 143 ) #define SID_CHOOSE_CONTROLS ( SID_SVX_START + 144 ) -#define SID_ACTIVATE_CONTROLS ( SID_SVX_START + 145 ) #define SID_INSERT_PUSHBUTTON ( SID_SVX_START + 146 ) #define SID_INSERT_RADIOBUTTON ( SID_SVX_START + 147 ) #define SID_INSERT_CHECKBOX ( SID_SVX_START + 148 ) -#define SID_OUTLINE ( SID_SVX_START + 149 ) #define SID_OUTLINE_UP ( SID_SVX_START + 150 ) #define SID_OUTLINE_DOWN ( SID_SVX_START + 151 ) #define SID_OUTLINE_LEFT ( SID_SVX_START + 152 ) @@ -518,9 +401,7 @@ #define SID_OUTLINE_COLLAPSE_ALL ( SID_SVX_START + 155 ) #define SID_OUTLINE_BULLET ( SID_SVX_START + 156 ) #define SID_PRESENTATION ( SID_SVX_START + 157 ) -#define SID_TIMER ( SID_SVX_START + 158 ) #define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 ) -#define SID_DIA ( SID_SVX_START + 160 ) #define SID_HIDE_SLIDE ( SID_SVX_START + 161 ) #define SID_CHOOSE_POLYGON ( SID_SVX_START + 162 ) //#define SID_SHOW_BROWSER ( SID_SVX_START + 163 ) -> sfxsids.hrc @@ -562,19 +443,6 @@ #define SID_DIALOG_TESTMODE ( SID_SVX_START + 199 ) #define SID_FRAME_LINESTYLE ( SID_SVX_START + 200 ) #define SID_FRAME_LINECOLOR ( SID_SVX_START + 201 ) -#define SID_ATTR_GRID_USE ( SID_SVX_START + 202 ) -#define SID_ATTR_GRID_VISIBLE ( SID_SVX_START + 203 ) -#define SID_ATTR_GRID_DRAW_X ( SID_SVX_START + 204 ) -#define SID_ATTR_GRID_DRAW_Y ( SID_SVX_START + 205 ) -#define SID_ATTR_GRID_DIVISION_X ( SID_SVX_START + 206 ) -#define SID_ATTR_GRID_DIVISION_Y ( SID_SVX_START + 207 ) -#define SID_ATTR_GRID_SNAP_X ( SID_SVX_START + 208 ) -#define SID_ATTR_GRID_SNAP_Y ( SID_SVX_START + 209 ) -#define SID_ATTR_GRID_ORIGIN_X ( SID_SVX_START + 210 ) -#define SID_ATTR_GRID_ORIGIN_Y ( SID_SVX_START + 211 ) -#define SID_IMPORT_GRAPH_PREVIEW ( SID_SVX_START + 212 ) -#define SID_IMPORT_GRAPH_LASTPATH ( SID_SVX_START + 213 ) -#define SID_IMPORT_GRAPH_LASTFILTER ( SID_SVX_START + 214 ) #define SID_SEARCHDLG_SEARCHSTRINGS ( SID_SVX_START + 215 ) #define SID_SEARCHDLG_REPLACESTRINGS ( SID_SVX_START + 216 ) #define SID_ATTR_TABLE ( SID_SVX_START + 217 ) @@ -605,10 +473,8 @@ #define SID_SPELL_DIALOG ( SID_SVX_START + 243 ) #define SID_INSERT_DRAW ( SID_SVX_START + 244 ) #define SID_THESAURUS ( SID_SVX_START + 245 ) -#define SID_AUTOCOMPLETEWORD ( SID_SVX_START + 251 ) #define SID_DRAW_TEXT ( SID_SVX_START + 253 ) #define SID_DRAW_CAPTION ( SID_SVX_START + 254 ) -#define SID_INSERT_LEGEND SID_DRAW_CAPTION #define SID_DRAW_SELECT ( SID_SVX_START + 255 ) #define SID_FONTWORK ( SID_SVX_START + 256 ) #define SID_FORMTEXT_STYLE ( SID_SVX_START + 257 ) @@ -623,12 +489,6 @@ #define SID_FORMTEXT_SHDWYVAL ( SID_SVX_START + 266 ) #define SID_FORMTEXT_STDFORM ( SID_SVX_START + 267 ) #define SID_FORMTEXT_HIDEFORM ( SID_SVX_START + 268 ) -#define SID_FORMTEXT_RESERVED1 ( SID_SVX_START + 269 ) -#define SID_FORMTEXT_RESERVED2 ( SID_SVX_START + 270 ) -#define SID_FORMTEXT_RESERVED3 ( SID_SVX_START + 271 ) -#define SID_FORMTEXT_RESERVED4 ( SID_SVX_START + 272 ) -#define SID_FORMTEXT_RESERVED5 ( SID_SVX_START + 273 ) -#define SID_FORMTEXT_RESERVED_LAST ( SID_SVX_START + 274 ) #define SID_GALLERY_ENABLE_ADDCOPY ( SID_SVX_START + 276 ) #define SID_GALLERY_IMPORTTHEME ( SID_SVX_START + 277 ) #define SID_GALLERY_BG_POS ( SID_SVX_START + 278 ) @@ -643,7 +503,6 @@ #define SID_FRAME_TO_BOTTOM ( SID_SVX_START + 287 ) #define SID_POSTIT ( SID_SVX_START + 288 ) //#define SID_ZOOM ( SID_SVX_START + 289 ) -> sfxsids.hrc -#define SID_GRID ( SID_SVX_START + 290 ) //#define SID_SEARCH_ITEM ( SID_SVX_START + 291 ) -> sfxsids.hrc #define SID_SEARCH_SEARCHSET ( SID_SVX_START + 292 ) #define SID_SEARCH_REPLACESET ( SID_SVX_START + 293 ) @@ -654,7 +513,6 @@ #define SID_ATTR_GRID_OPTIONS ( SID_SVX_START + 298 ) #define SID_ATTR_FILL_SHADOW ( SID_SVX_START + 299 ) #define SID_ATTR_LINEEND_STYLE ( SID_SVX_START + 301 ) -#define SID_ATTR_TRANSFORM_SLANT ( SID_SVX_START + 302 ) // !!! #define SID_ATTR_TRANSFORM_SHEAR ( SID_SVX_START + 304 ) #define SID_ATTR_TRANSFORM_SHEAR_X ( SID_SVX_START + 305 ) #define SID_ATTR_TRANSFORM_SHEAR_Y ( SID_SVX_START + 306 ) @@ -671,43 +529,25 @@ #define SID_ATTR_TRANSFORM_HORI_MIRROR ( SID_SVX_START + 317 ) #define SID_ATTR_TRANSFORM_ANCHOR ( SID_SVX_START + 318 ) #define SID_ATTR_TRANSFORM_VERT_ORIENT ( SID_SVX_START + 319 ) -#define SID_TAB_INSERT ( SID_SVX_START + 320 ) -#define SID_TAB_COUNT ( SID_SVX_START + 321 ) -#define SID_TAB_POSITION ( SID_SVX_START + 322 ) -#define SID_TAB_ADJUST ( SID_SVX_START + 323 ) -#define SID_TAB_DECIMAL ( SID_SVX_START + 324 ) -#define SID_TAB_FILLCHAR ( SID_SVX_START + 325 ) #define SID_SCAN ( SID_SVX_START + 330 ) #define SID_TWAIN_SELECT ( SID_SVX_START + 331 ) #define SID_TWAIN_TRANSFER ( SID_SVX_START + 332 ) #define SID_CONTOUR_DLG ( SID_SVX_START + 334 ) #define SID_CONTOUR_EXEC ( SID_SVX_START + 335 ) #define SID_BORDER_OBJECT ( SID_SVX_START + 340 ) -#define SID_BORDER_LEFTLINE ( SID_SVX_START + 341 ) -#define SID_BORDER_RIGHTLINE ( SID_SVX_START + 342 ) -#define SID_BORDER_TOPLINE ( SID_SVX_START + 343 ) -#define SID_BORDER_BOTTOMLINE ( SID_SVX_START + 344 ) -#define SID_BORDER_HORIZONTALLINE ( SID_SVX_START + 345 ) -#define SID_BORDER_VERTICALLINE ( SID_SVX_START + 346 ) -#define SID_BORDER_DISTANCE ( SID_SVX_START + 347 ) #define SID_SB_CONNECTIONPOOLING ( SID_SVX_START + 348 ) #define SID_SB_DBREGISTEROPTIONS ( SID_SVX_START + 349 ) #define SID_BMPMASK ( SID_SVX_START + 350 ) #define SID_BMPMASK_PIPETTE ( SID_SVX_START + 351 ) -#define SID_BMPMASK_BMPSELECT ( SID_SVX_START + 352 ) #define SID_BMPMASK_EXEC ( SID_SVX_START + 353 ) //#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc //#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc -#define SID_NO_GRAPHICS ( SID_SVX_START + 364 ) -#define SID_IMPORT_GRAPH_LASTURL ( SID_SVX_START + 365 ) //#define SID_NAVIGATOR ( SID_SVX_START + 366 ) -> sfxsids.hrc #define SID_ATTR_TEXT_FITTOSIZE ( SID_SVX_START + 367 ) #define SID_ATTR_BRUSH_ROW ( SID_SVX_START + 368 ) #define SID_OPTFILTER_MSOFFICE ( SID_SVX_START + 369 ) //#define SID_TASKPANE ( SID_SVX_START + 370 ) -> sfxsids.hrc #define SID_IMAP ( SID_SVX_START + 371 ) -#define SID_IMAP_DLG ( SID_SVX_START + 372 ) -#define SID_IMAP_SELECT ( SID_SVX_START + 373 ) #define SID_IMAP_EXEC ( SID_SVX_START + 374 ) #define SID_SHOW_HIDDEN ( SID_SVX_START + 375 ) #define SID_SHOW_FORMS ( SID_SVX_START + 376 ) @@ -741,11 +581,7 @@ #define SID_ATTR_FLASH ( SID_SVX_START + 406 ) #define SID_ATTR_3D_LIGHT ( SID_SVX_START + 407 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_START SID_ATTR_3D_LIGHT -#define SID_ATTR_3D_LIGHTINTENSITY ( SID_SVX_START + 408 ) /* Slots mit --> koennen demnaechst entfallen */ -#define SID_ATTR_3D_LIGHTCOLOR ( SID_SVX_START + 409 ) /* Slots mit --> koennen demnaechst entfallen */ -#define SID_ATTR_3D_AMBIENTINTENSITY ( SID_SVX_START + 410 ) /* Slots mit --> koennen demnaechst entfallen */ #define SID_ATTR_3D_AMBIENTCOLOR ( SID_SVX_START + 411 ) -#define SID_IMPORT_GRAPH_LINK ( SID_SVX_START + 412 ) //! moved to sfx2, still in use: //#define SID_HTML_MODE ( SID_SVX_START + 414 ) @@ -769,7 +605,6 @@ #define SID_TABLE_PARAM_INSERT_AFTER ( SID_SVX_START + 428 ) #define SID_TABLEDESIGN ( SID_SVX_START + 429 ) -#define SID_MN_AUTOPILOT ( SID_SVX_START + 430 ) #define SID_GENERAL_OPTIONS ( SID_SVX_START + 432 ) #define SID_SW_EDITOPTIONS ( SID_SVX_START + 433 ) #define SID_SD_EDITOPTIONS ( SID_SVX_START + 434 ) @@ -778,16 +613,11 @@ #define SID_SCH_EDITOPTIONS ( SID_SVX_START + 437 ) #define SID_SIM_EDITOPTIONS ( SID_SVX_START + 438 ) #define SID_SW_ONLINEOPTIONS ( SID_SVX_START + 439 ) -#define SID_MN_OPTIONS ( SID_SVX_START + 440 ) #define SID_GET_COLORLIST ( SID_SVX_START + 441 ) -#define SID_MN_INSERT_OBJECT_DLGS ( SID_SVX_START + 442 ) #define SID_OUTLINE_TO_IMPRESS ( SID_SVX_START + 443 ) -#define SID_SIM_TP_COLOR ( SID_SVX_START + 444 ) -#define SID_SIM_TP_EFFECTS ( SID_SVX_START + 445 ) #define SID_SPELLCHECKER_CHANGED ( SID_SVX_START + 446 ) #define SID_SD_GRAPHIC_OPTIONS ( SID_SVX_START + 447 ) #define SID_SM_TP_PRINTOPTIONS ( SID_SVX_START + 448 ) -#define SID_OFASLOTS_END ( SID_SVX_START + 449 ) #define SID_SB_STARBASEOPTIONS ( SID_SVX_START + 450 ) #define SID_SWREGISTER_COLLECTION ( SID_SVX_START + 451 ) #define SID_FILTER_DLG ( SID_SVX_START + 452 ) @@ -795,7 +625,6 @@ #define SID_GROUP ( SID_SVX_START + 454 ) #define SID_UNGROUP ( SID_SVX_START + 455 ) #define SID_SET_DEFAULT ( SID_SVX_START + 456 ) -#define SID_BEZIER ( SID_SVX_START + 458 ) #define SID_ATTR_3D_DOUBLE_SIDED ( SID_SVX_START + 459 ) #define SID_ATTR_ALIGN_INDENT ( SID_SVX_START + 460 ) #define SID_DEC_INDENT ( SID_SVX_START + 461 ) @@ -803,9 +632,7 @@ #define SID_DRAW_FREELINE ( SID_SVX_START + 463 ) #define SID_DRAW_FREELINE_NOFILL ( SID_SVX_START + 464 ) #define SID_DRAW_TEXT_MARQUEE ( SID_SVX_START + 465 ) -#define SID_SCH_TP_DEFCOLORS ( SID_SVX_START + 466 ) #define SID_SWREGISTER_MODE ( SID_SVX_START + 467 ) -#define SID_OPTBASE_DATABASENAMES ( SID_SVX_START + 468 ) #define SID_GRFFILTER ( SID_SVX_START + 469 ) #define SID_GRFFILTER_INVERT ( SID_SVX_START + 470 ) #define SID_GRFFILTER_SMOOTH ( SID_SVX_START + 471 ) @@ -818,39 +645,13 @@ #define SID_GRFFILTER_POPART ( SID_SVX_START + 478 ) #define SID_GRFFILTER_SEPIA ( SID_SVX_START + 479 ) #define SID_GRFFILTER_SOLARIZE ( SID_SVX_START + 480 ) -#define SID_COLL_CLEAR ( SID_SVX_START + 536 ) -#define SID_SHOW_ADDRESS ( SID_SVX_START + 538 ) -#define SID_APP_ENTERWAIT ( SID_SVX_START + 550 ) -#define SID_APP_LEAVEWAIT ( SID_SVX_START + 551 ) -#define SID_APP_ISWAIT ( SID_SVX_START + 552 ) -#define SID_OFA_TBL_DESIGNVIEW ( SID_SVX_START + 554 ) -#define SID_OFA_TBL_ADRESSBOOK ( SID_SVX_START + 555 ) -#define SID_OFA_QRY_DESIGNVIEW ( SID_SVX_START + 556 ) -#define SID_OFA_QRY_SQLVIEW ( SID_SVX_START + 557 ) -#define SID_OFA_FRM_DESIGNVIEW ( SID_SVX_START + 558 ) -#define SID_OFA_RPT_DESIGNVIEW ( SID_SVX_START + 559 ) -#define SID_OFA_TBL_CREATE ( SID_SVX_START + 560 ) -#define SID_OFA_QRY_CREATE ( SID_SVX_START + 561 ) -#define SID_OFA_FRM_CREATE ( SID_SVX_START + 562 ) -#define SID_OFA_RPT_CREATE ( SID_SVX_START + 563 ) #define SID_FIELD_GRABFOCUS ( SID_SVX_START + 567 ) #define SID_ATTR_3D_HORZ_SEGS ( SID_SVX_START + 568 ) #define SID_ATTR_3D_VERT_SEGS ( SID_SVX_START + 569 ) -#define SID_ATTR_3D_DUMMY_1 ( SID_SVX_START + 570 ) -#define SID_ATTR_3D_DUMMY_2 ( SID_SVX_START + 571 ) -#define SID_BROWSER_DLG ( SID_SVX_START + 572 ) -#define SID_OFA_TBL_COMPRESS ( SID_SVX_START + 576 ) #define SID_ATTR_ALIGN_DEGREES ( SID_SVX_START + 577 ) #define SID_ATTR_ALIGN_LOCKPOS ( SID_SVX_START + 578 ) #define SID_ATTR_LINEEND_WIDTH_DEFAULT ( SID_SVX_START + 579 ) #define SID_ATTR_NUMBERFORMAT_ONE_AREA ( SID_SVX_START + 580 ) -#define SID_FUNCTION_CONTROL ( SID_SVX_START + 581 ) -#define SID_TAB_REMOVE ( SID_SVX_START + 582 ) -#define SID_TAB_REMOVE_ALL ( SID_SVX_START + 583 ) -#define SID_TAB_REMOVE_BY_INDEX ( SID_SVX_START + 584 ) -#define SID_OFA_VW_CREATE ( SID_SVX_START + 585 ) -#define SID_OFA_REL_DESIGNVIEW ( SID_SVX_START + 588 ) -#define SID_OFA_MANUAL_SQL ( SID_SVX_START + 589 ) #define SID_PARA_BACKGRND_DESTINATION ( SID_SVX_START + 590 ) #define SID_FMSLOTS_START ( SID_SVX_START + 592 ) @@ -901,7 +702,6 @@ #define SID_FM_NEW ( SID_SVX_START + 638 ) #define SID_FM_DELETE ( SID_SVX_START + 639 ) #define SID_FM_NEW_FORM ( SID_SVX_START + 640 ) -#define SID_FMSLOTS_END ( SID_SVX_START + 641 ) #define SID_REDLIN_FILTER_PAGE ( SID_SVX_START + 642 ) #define SID_REDLIN_VIEW_PAGE ( SID_SVX_START + 643 ) #define SID_3D_WIN ( SID_SVX_START + 644 ) @@ -917,53 +717,14 @@ #define SID_ATTR_3D_NORMALS_INVERT ( SID_SVX_START + 654 ) #define SID_ATTR_3D_TWO_SIDED_LIGHTING ( SID_SVX_START + 655 ) #define SID_ATTR_3D_TEXTURE_KIND ( SID_SVX_START + 656 ) -#define SID_ATTR_3D_TEXTURE_MODE ( SID_SVX_START + 657 ) -#define SID_ATTR_3D_TEXTURE_PROJ_X ( SID_SVX_START + 658 ) -#define SID_ATTR_3D_TEXTURE_PROJ_Y ( SID_SVX_START + 659 ) -#define SID_ATTR_3D_TEXTURE_FILTER ( SID_SVX_START + 660 ) -#define SID_ATTR_3D_MAT_COLOR ( SID_SVX_START + 661 ) -#define SID_ATTR_3D_MAT_EMISSION ( SID_SVX_START + 662 ) -#define SID_ATTR_3D_MAT_SPECULAR ( SID_SVX_START + 663 ) #define SID_ATTR_3D_MAT_SPECULAR_INTENSITY ( SID_SVX_START + 664 ) #define SID_ATTR_3D_SHADE_MODE ( SID_SVX_START + 665 ) #define SID_ATTR_3D_SHADOW_3D ( SID_SVX_START + 666 ) #define SID_ATTR_3D_SHADOW_SLANT ( SID_SVX_START + 667 ) -#define SID_ATTR_3D_LIGHTCOLOR_1 ( SID_SVX_START + 668 ) -#define SID_ATTR_3D_LIGHTCOLOR_2 ( SID_SVX_START + 669 ) -#define SID_ATTR_3D_LIGHTCOLOR_3 ( SID_SVX_START + 670 ) -#define SID_ATTR_3D_LIGHTCOLOR_4 ( SID_SVX_START + 671 ) -#define SID_ATTR_3D_LIGHTCOLOR_5 ( SID_SVX_START + 672 ) -#define SID_ATTR_3D_LIGHTCOLOR_6 ( SID_SVX_START + 673 ) -#define SID_ATTR_3D_LIGHTCOLOR_7 ( SID_SVX_START + 674 ) -#define SID_ATTR_3D_LIGHTCOLOR_8 ( SID_SVX_START + 675 ) -#define SID_ATTR_3D_LIGHTON_1 ( SID_SVX_START + 676 ) -#define SID_ATTR_3D_LIGHTON_2 ( SID_SVX_START + 677 ) -#define SID_ATTR_3D_LIGHTON_3 ( SID_SVX_START + 678 ) -#define SID_ATTR_3D_LIGHTON_4 ( SID_SVX_START + 679 ) -#define SID_ATTR_3D_LIGHTON_5 ( SID_SVX_START + 680 ) -#define SID_ATTR_3D_LIGHTON_6 ( SID_SVX_START + 681 ) -#define SID_ATTR_3D_LIGHTON_7 ( SID_SVX_START + 682 ) -#define SID_ATTR_3D_LIGHTON_8 ( SID_SVX_START + 683 ) -#define SID_ATTR_3D_LIGHTDIRECTION_1 ( SID_SVX_START + 684 ) -#define SID_ATTR_3D_LIGHTDIRECTION_2 ( SID_SVX_START + 685 ) -#define SID_ATTR_3D_LIGHTDIRECTION_3 ( SID_SVX_START + 686 ) -#define SID_ATTR_3D_LIGHTDIRECTION_4 ( SID_SVX_START + 687 ) -#define SID_ATTR_3D_LIGHTDIRECTION_5 ( SID_SVX_START + 688 ) -#define SID_ATTR_3D_LIGHTDIRECTION_6 ( SID_SVX_START + 689 ) -#define SID_ATTR_3D_LIGHTDIRECTION_7 ( SID_SVX_START + 690 ) #define SID_ATTR_3D_LIGHTDIRECTION_8 ( SID_SVX_START + 691 ) #define SID_ATTR_3D_END SID_ATTR_3D_LIGHTDIRECTION_8 -#define SID_ATTR_3D_DUMMY_3 ( SID_SVX_START + 692 ) -#define SID_ATTR_3D_DUMMY_4 ( SID_SVX_START + 693 ) -#define SID_ATTR_3D_DUMMY_5 ( SID_SVX_START + 694 ) -#define SID_ATTR_3D_DUMMY_6 ( SID_SVX_START + 695 ) -#define SID_ATTR_3D_DUMMY_7 ( SID_SVX_START + 696 ) -#define SID_ATTR_3D_DUMMY_8 ( SID_SVX_START + 697 ) -#define SID_ATTR_3D_DUMMY_9 ( SID_SVX_START + 698 ) -#define SID_ATTR_3D_DUMMY_10 ( SID_SVX_START + 699 ) #define SID_ATTR_NUMBERFORMAT_NOLANGUAGE ( SID_SVX_START + 700 ) #define SID_MN_GROUP ( SID_SVX_START + 701 ) -#define SID_FM_AUTO_ORDER ( SID_SVX_START + 702 ) #define SID_MORE_FMSLOTS_START ( SID_SVX_START + 702 ) #define SID_FM_SHOW_PROPERTY_BROWSER ( SID_SVX_START + 703 ) @@ -1037,15 +798,11 @@ #define SID_FM_SHOW_DATANAVIGATOR ( SID_SVX_START + 773 ) #define SID_FM_DATANAVIGATOR_CONTROL ( SID_SVX_START + 774 ) #define SID_FM_REFRESH_FORM_CONTROL ( SID_SVX_START + 775 ) -#define SID_MORE_FMSLOTS_END ( SID_SVX_START + 850 ) #define SID_HLINKBAR_LINK ( SID_SVX_START + 851 ) -#define SID_HLINKBAR_BOOKMARK ( SID_SVX_START + 852 ) #define SID_HLINKBAR_SEARCH ( SID_SVX_START + 853 ) #define SID_HLINKBAR_TARGET ( SID_SVX_START + 854 ) #define SID_PARAM_NUM_PRESET ( SID_SVX_START + 856 ) -#define SID_PARAM_CUR_NUMBER ( SID_SVX_START + 857 ) -#define SID_PARAM_CHILD_LEVELS ( SID_SVX_START + 858 ) #define SID_PARAM_CUR_NUM_LEVEL ( SID_SVX_START + 859 ) #define SID_CREATE_SW_DRAWVIEW ( SID_SVX_START + 860 ) #define SID_ATTR_GRAF_LUMINANCE ( SID_SVX_START + 863 ) @@ -1057,17 +814,12 @@ #define SID_ATTR_GRAF_TRANSPARENCE ( SID_SVX_START + 869 ) #define SID_ATTR_GRAF_INVERT ( SID_SVX_START + 870 ) #define SID_ATTR_GRAF_MODE ( SID_SVX_START + 871 ) -#define SID_ATTR_GRAF_RESERVE2 ( SID_SVX_START + 872 ) -#define SID_ATTR_GRAF_RESERVE3 ( SID_SVX_START + 873 ) -#define SID_ATTR_GRAF_RESERVE4 ( SID_SVX_START + 874 ) -#define SID_ATTR_GRAF_RESERVE5 ( SID_SVX_START + 875 ) //#define SID_COMP_BIBLIOGRAPHY ( SID_SVX_START + 880 ) -> sfxsids.hrc #define SID_ATTR_GRAF_KEEP_ZOOM ( SID_SVX_START + 882 ) #define SID_ATTR_GRAF_CROP ( SID_SVX_START + 883 ) #define SID_ATTR_GRAF_FRMSIZE ( SID_SVX_START + 884 ) #define SID_ATTR_GRAF_FRMSIZE_PERCENT ( SID_SVX_START + 885 ) #define SID_ATTR_GRAF_GRAPHIC ( SID_SVX_START + 886 ) -#define SID_ASIAN_DLG ( SID_SVX_START + 904 ) #define SID_DRAW_TEXT_VERTICAL SID_ATTR_CHAR_VERTICAL #define SID_DRAW_CAPTION_VERTICAL ( SID_SVX_START + 906 ) #define SID_TEXTDIRECTION_LEFT_TO_RIGHT ( SID_SVX_START + 907 ) @@ -1275,55 +1027,6 @@ #error Resource-Ueberlauf in #line, #file #endif -// -------------------------------------------------------------------------- -// Ranges, um ItemSets fuer bestimmte 3D-Objekte erstellen zu koennen -// -------------------------------------------------------------------------- - -// -// SceneObject: -#define SID_ATTR_3D_RANGE_SCENE \ -SID_ATTR_3D_AMBIENTCOLOR, SID_ATTR_3D_PERSPECTIVE, \ -SID_ATTR_3D_DISTANCE, SID_ATTR_3D_FOCAL_LENGTH, \ -SID_ATTR_3D_TWO_SIDED_LIGHTING, SID_ATTR_3D_TWO_SIDED_LIGHTING, \ -SID_ATTR_3D_SHADE_MODE, SID_ATTR_3D_SHADE_MODE, \ -SID_ATTR_3D_SHADOW_SLANT, SID_ATTR_3D_LIGHTDIRECTION_8 \ - -// -// CompoundObject: -#define SID_ATTR_3D_RANGE_COMPOUND \ -SID_ATTR_3D_DOUBLE_SIDED, SID_ATTR_3D_DOUBLE_SIDED, \ -SID_ATTR_3D_NORMALS_KIND, SID_ATTR_3D_NORMALS_INVERT, \ -SID_ATTR_3D_TEXTURE_KIND, SID_ATTR_3D_MAT_SPECULAR_INTENSITY, \ -SID_ATTR_3D_SHADOW_3D, SID_ATTR_3D_SHADOW_3D \ - -// -// ExtrudeObject: -#define SID_ATTR_3D_RANGE_EXTRUDE \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_DEPTH, SID_ATTR_3D_DEPTH, \ -SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_BACKSCALE \ - -// -// LatheObject: -#define SID_ATTR_3D_RANGE_LATHE \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS, \ -SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_END_ANGLE \ - -// -// SphereObject: -#define SID_ATTR_3D_RANGE_SPHERE \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS \ - -// -// Spezieller Range fuer alle 3D-Objekte -#define SID_ATTR_3D_RANGE_OBJECT \ -SID_ATTR_3D_RANGE_COMPOUND, \ -SID_ATTR_3D_DEPTH, SID_ATTR_3D_DEPTH, \ -SID_ATTR_3D_HORZ_SEGS, SID_ATTR_3D_VERT_SEGS, \ -SID_ATTR_3D_PERCENT_DIAGONAL, SID_ATTR_3D_END_ANGLE \ - #endif // #ifndef _SVX_SVXIDS_HRC // ******************************************************************* EOF diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc index e726bef7c7bd..bb5fed1dfef1 100644 --- a/svx/source/dialog/bmpmask.hrc +++ b/svx/source/dialog/bmpmask.hrc @@ -33,7 +33,6 @@ #define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5) /*-----IAccessibility2 Implementation 2009*/ #define GRP_Q 1 -#define CTR_PIPETTE 1 #define CBX_1 1 #define CBX_2 4 #define CBX_3 3 @@ -47,7 +46,6 @@ #define SP_2 4 #define SP_3 1 #define SP_4 3 -#define GRP_D 2 #define TBX_PIPETTE 1 #define TBI_PIPETTE 1 #define WND_PIPETTE 10 diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc index cfbc70294a49..0af6dc6ac334 100644 --- a/svx/source/dialog/ctredlin.hrc +++ b/svx/source/dialog/ctredlin.hrc @@ -51,7 +51,6 @@ #define CB_COMMENT 19 #define ED_COMMENT 20 -#define HG_VIEW 1 #define DG_VIEW 2 #define PB_ACCEPT 3 #define PB_ACCEPTALL 4 diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 3944ac3e0438..0df675329d8c 100644 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -46,7 +46,6 @@ #define FT_SAVE_DESCR 4 #define FT_SAVE_FILELIST 5 #define LB_SAVE_FILELIST 6 -#define CB_SAVE_LAUNCHAUTO 7 #define FL_SAVE_BOTTOM 8 #define BT_SAVE_OK 9 @@ -54,7 +53,6 @@ #define SAVE_WIDTH 290 #define SAVE_HEIGHT 238 #define SAVE_TITLEWINHEIGHT 36 -#define SAVE_DESCRHEIGHT 48 #define SAVE_COL0 (RSC_SP_DLG_INNERBORDER_LEFT) #define SAVE_COL2 (SAVE_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) #define SAVE_COL1 (SAVE_COL2-RSC_CD_PUSHBUTTON_WIDTH) @@ -121,10 +119,7 @@ #define RECOV_TITLEWINHEIGHT SAVE_TITLEWINHEIGHT #define RECOV_DESCRHEIGHT 6*RSC_CD_FIXEDTEXT_HEIGHT #define RECOV_COL1 (RSC_SP_DLG_INNERBORDER_LEFT) -#define RECOV_COL2 40 #define RECOV_COL3 (RECOV_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define RECOV_COL_A (RECOV_COL1) -#define RECOV_COL_B (COL_1+RSC_CD_PUSHBUTTON_WIDTH) #define RECOV_COL_G (RECOV_COL3) #define RECOV_COL_F (RECOV_COL_G-RSC_CD_PUSHBUTTON_WIDTH) #define RECOV_COL_E (RECOV_COL_F-RSC_SP_CTRL_X) @@ -179,7 +174,6 @@ // TabPage Error Report Welcome // most defines equal to TabPage Recovery -#define RECOV_DESCR_HEIGHT (RECOV_ROW7-RECOV_ROW2) // TabPage Error Report Send // borrow basic metrics from TabPage Recovery @@ -223,7 +217,6 @@ #define ERRSEND_ROW8 (ERRSEND_ROW7+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_GROUP_Y) #define ERRSEND_ROW9 (ERRSEND_ROW8+RSC_CD_PUSHBUTTON_HEIGHT) #define ERRSEND_ROW10 (ERRSEND_ROW9+RSC_SP_CTRL_GROUP_Y) -#define ERRSEND_ROW11 (ERRSEND_ROW10+RSC_CD_PUSHBUTTON_HEIGHT) #define ERRSEND_ROW16 (ERRSEND_HEIGHT-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_HEIGHT) #define ERRSEND_ROW15 (ERRSEND_ROW16-RSC_SP_CTRL_GROUP_Y-RSC_CD_FIXEDLINE_HEIGHT) diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index 07cdf696eea1..abd30cae4f76 100644 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc @@ -49,7 +49,6 @@ #define TBI_FREEPOLY 8 #define TBI_ACTIVE 16 -#define TBI_COLOR 17 #define TBI_MACRO 18 #define TBI_PROPERTY 19 @@ -63,10 +62,8 @@ #define FT_URL 1 #define FT_TEXT 2 -#define FT_TARG 3 #define CBB_URL 1 #define EDT_TEXT 1 -#define LB_TARG 1 #define STB_STATUS 1 diff --git a/svx/source/dialog/optgrid.hrc b/svx/source/dialog/optgrid.hrc index ced9bee740ca..59fae935695b 100644 --- a/svx/source/dialog/optgrid.hrc +++ b/svx/source/dialog/optgrid.hrc @@ -28,22 +28,15 @@ #define _SVX_OPTGRID_HRC //Grid-Page -#define MTR_FLD_GRID 1 #define GRP_DRAWGRID 2 -#define GRP_SNAPGRID 3 #define CBX_USE_GRIDSNAP 4 #define CBX_SYNCHRONIZE 5 -#define CBX_EQUAL_GRID 6 #define CBX_SNAPGRID 7 #define CBX_GRID_VISIBLE 8 #define MTR_FLD_DRAW_Y 9 -#define MTR_FLD_SNAP_X 10 -#define MTR_FLD_SNAP_Y 11 #define MTR_FLD_DRAW_X 12 #define NUM_FLD_DIVISION_X 13 #define NUM_FLD_DIVISION_Y 14 -#define FT_SNAP_X 15 -#define FT_SNAP_Y 16 #define FT_DRAW_X 17 #define FT_DRAW_Y 18 #define FL_RESOLUTION 19 diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc index c2c00a513948..38ac4d239603 100644 --- a/svx/source/dialog/srchdlg.hrc +++ b/svx/source/dialog/srchdlg.hrc @@ -80,10 +80,7 @@ #define RB_CALC_COLUMNS 58 #define CB_ALL_SHEETS 59 -#define CB_COMMENTS 60 - -#define IMG_MOREBTN_DOWN 100 -#define IMG_MOREBTN_UP 101 +#define CB_COMMENTS 60 #define STR_WORDCALC 100 #define STR_MORE_BTN 101 diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index e33d7f761cd5..d0ef963c1988 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -136,15 +136,12 @@ #define RID_RIDER_SLL_SITE (RID_OFA_START + 100) #define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101) - // "Uberlaufkontrolle der HID's #define ACT_HID_END HID_OFA_TP_MEMORY #if ACT_HID_END > HID_OFA_END #error Resource-Ueberlauf bei den HIDs der OFA #endif -#define STR_SD_STAROFFICE_XML_DRAW (RID_OFA_START + 245) -#define STR_SD_STAROFFICE_XML_IMPRESS (RID_OFA_START + 246) #endif diff --git a/svx/source/tbxctrls/lboxctrl.hrc b/svx/source/tbxctrls/lboxctrl.hrc index 3026fee5cff3..bda9a9b87d9e 100644 --- a/svx/source/tbxctrls/lboxctrl.hrc +++ b/svx/source/tbxctrls/lboxctrl.hrc @@ -26,5 +26,4 @@ ************************************************************************/ #define LB_SVXTBX_UNDO_REDO_CTRL 11 -#define FT_NUM_OPERATIONS 12 diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc index b33b19b814c7..5d39a2732da4 100644 --- a/sw/inc/access.hrc +++ b/sw/inc/access.hrc @@ -41,9 +41,6 @@ #define STR_ACCESS_FOOTNOTE_DESC (RC_ACCESS_BEGIN + 9) #define STR_ACCESS_ENDNOTE_NAME (RC_ACCESS_BEGIN + 10) #define STR_ACCESS_ENDNOTE_DESC (RC_ACCESS_BEGIN + 11) -#define STR_ACCESS_REPLACEMENT_POSTIT (RC_ACCESS_BEGIN + 12) -#define STR_ACCESS_REPLACEMENT_FRAME (RC_ACCESS_BEGIN + 13) -#define STR_ACCESS_REPLACEMENT_BULLET_GRAPHICS (RC_ACCESS_BEGIN + 14) #define STR_ACCESS_TABLE_DESC (RC_ACCESS_BEGIN + 15) #define STR_ACCESS_PAGE_NAME (RC_ACCESS_BEGIN + 16) #define STR_ACCESS_PAGE_DESC (RC_ACCESS_BEGIN + 17) diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc index 9b94db2029ff..d21848e346f3 100644 --- a/sw/inc/chrdlg.hrc +++ b/sw/inc/chrdlg.hrc @@ -34,8 +34,6 @@ #define DLG_PARA (RC_CHRDLG_BEGIN + 2) #define DLG_PAGE (RC_CHRDLG_BEGIN + 3) #define DLG_BREAK (RC_CHRDLG_BEGIN + 5) -#define DLG_PAGENUM (RC_CHRDLG_BEGIN + 6) -#define DLG_HEADER_FOOTER (RC_CHRDLG_BEGIN + 7) #define DLG_DROPCAPS (RC_CHRDLG_BEGIN + 8) #define DLG_DRAWCHAR (RC_CHRDLG_BEGIN + 9) #define DLG_DRAWPARA (RC_CHRDLG_BEGIN + 10) diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc index f630cf9d7c41..3e1765e16915 100644 --- a/sw/inc/dialog.hrc +++ b/sw/inc/dialog.hrc @@ -32,12 +32,8 @@ // Dialoge ****************************************************************** -#define DLG_SAVE_REGISTRY_FILE (RC_DIALOG_BEGIN + 1) #define DLG_PASSWD (RC_DIALOG_BEGIN + 3) -#define DLG_PASTESPECIAL (RC_DIALOG_BEGIN + 5) -#define DLG_LINKS (RC_DIALOG_BEGIN + 6) -#define DLG_LINKEDIT (RC_DIALOG_BEGIN + 7) #define DLG_INSERT_ABSTRACT (RC_DIALOG_BEGIN + 8) #define DLG_ASCII_FILTER (RC_DIALOG_BEGIN + 9) #define DLG_WORDCOUNT (RC_DIALOG_BEGIN + 10) @@ -53,8 +49,6 @@ #define STR_FLT_SGV (RC_DIALOG_BEGIN + 8) -#define STR_NEWDLG_NAME (RC_DIALOG_BEGIN + 10) - // Controls ***************************************************************** #define CB_USE_PASSWD (RC_DIALOG_BEGIN ) @@ -62,12 +56,11 @@ // Bereiche ***************************************************************** - #define RC_REGIONSW_BEGIN (RC_DIALOG_BEGIN + 60) -#define RC_REGIONSW_END (RC_DIALOG_BEGIN + 79) +// RC_REGIONSW_END (RC_DIALOG_BEGIN + 79) -#define RC_MACASSGN_BEGIN (RC_DIALOG_BEGIN + 80) #define RC_MACASSGN_END (RC_DIALOG_BEGIN + 89) +// RC_MACASSGN_END (RC_DIALOG_BEGIN + 89) #define RC_DLG_ADDR (RC_DIALOG_BEGIN + 90) #define RC_SWDLG_BACKGROUND (RC_DIALOG_BEGIN + 91) diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc index 08c4c7dc6d96..08161fb3fead 100644 --- a/sw/inc/envelp.hrc +++ b/sw/inc/envelp.hrc @@ -59,7 +59,7 @@ #define RC_ENVFMT_END (RC_ENVELP_BEGIN + 19) #define RC_ENVPRT_BEGIN (RC_ENVELP_BEGIN + 20) -#define RC_ENVPRT_END (RC_ENVELP_BEGIN + 39) +// RC_ENVPRT_END (RC_ENVELP_BEGIN + 39) #define RC_LABEL_BEGIN (RC_ENVELP_BEGIN + 40) #define RC_LABEL_END (RC_ENVELP_BEGIN + 49) @@ -67,7 +67,7 @@ #define RC_LABFMT_BEGIN (RC_ENVELP_BEGIN + 50) #define RC_LABFMT_END (RC_ENVELP_BEGIN + 62) -#define RC_LABPRT_BEGIN (RC_ENVELP_BEGIN + 63) +// RC_LABPRT_BEGIN (RC_ENVELP_BEGIN + 63) #define RC_LABPRT_END (RC_ENVELP_BEGIN + 72) // Strings -------------------------------------------------------------------- diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc index 52aa0eec2490..20438e01e390 100644 --- a/sw/inc/fldui.hrc +++ b/sw/inc/fldui.hrc @@ -29,16 +29,8 @@ #include "rcid.hrc" - -#define DLG_FLD RC_FLDDLG_BEGIN -#define DLG_RECORD_MRG (RC_FLDDLG_BEGIN + 1) -#define DLG_RECORD_INS (RC_FLDDLG_BEGIN + 2) -#define DLG_FLD_EDIT (RC_FLDDLG_BEGIN + 3) #define DLG_POSTIT (RC_FLDDLG_BEGIN + 4) #define DLG_FLD_INPUT (RC_FLDDLG_BEGIN + 5) -#define DLG_BRCFG (RC_FLDDLG_BEGIN + 6) -#define DLG_BRSEEK (RC_FLDDLG_BEGIN + 7) -#define DLG_BRSORT (RC_FLDDLG_BEGIN + 8) #define DLG_CHANGE_DB (RC_FLDDLG_BEGIN + 9) #define DLG_JAVAEDIT (RC_FLDDLG_BEGIN + 10) #define DLG_FLD_INSERT (RC_FLDDLG_BEGIN + 11) @@ -81,7 +73,6 @@ #define STR_PREVPAGEFLD (STR_TYPE_BEGIN + 29) #define STR_EXTUSERFLD (STR_TYPE_BEGIN + 30) - #define STR_SETINPUTFLD (STR_TYPE_BEGIN + 33) #define STR_USRINPUTFLD (STR_TYPE_BEGIN + 34) #define STR_SETREFPAGEFLD (STR_TYPE_BEGIN + 35) @@ -288,7 +279,6 @@ #define STR_ALL_DATABASE (STR_EXTRA + 13) #define STR_FLD_EDIT_DLG (STR_EXTRA + 14) -#define FLDDLG_ACT_END (STR_FLD_EDIT_DLG) #endif diff --git a/sw/inc/fmtui.hrc b/sw/inc/fmtui.hrc index 349445231c74..b6d1db51e9eb 100644 --- a/sw/inc/fmtui.hrc +++ b/sw/inc/fmtui.hrc @@ -30,8 +30,6 @@ #include "rcid.hrc" - -#define DLG_FMTENTRY (RC_FMTUI_BEGIN) #define DLG_NEW_FILE (RC_FMTUI_BEGIN + 1) #define STR_PAGE_STD (RC_FMTUI_BEGIN + 2) #define STR_PAGE_BORDER (RC_FMTUI_BEGIN + 3) @@ -41,23 +39,8 @@ #define STR_PAGE_FOOTNOTE (RC_FMTUI_BEGIN + 7) #define STR_PAGE_TEXTGRID (RC_FMTUI_BEGIN + 8) -#define DLG_STD_CHAR (RC_FMTUI_BEGIN + 15) - #define MN_TEXT (RC_FMTUI_BEGIN + 20) -#define MN_GRAFIC (RC_FMTUI_BEGIN + 21) -#define MN_TABLE (RC_FMTUI_BEGIN + 22) - -#define MN_REGION (RC_FMTUI_BEGIN + 24) -#define MN_REGION_SUB (RC_FMTUI_BEGIN + 25) - -#define DLG_DOC_STYLE (RC_FMTUI_BEGIN + 26) -#define DLG_NEW_COLL (RC_FMTUI_BEGIN + 28) - -#define DLG_TEMPLATE_PI (RC_FMTUI_BEGIN + 29) -#define DLG_HELP_ID (RC_FMTUI_BEGIN + 30) - -#define STR_OVERWRITE (RC_FMTUI_BEGIN + 32) #define ST_CUSTOMIZE 1 // Do not change relations to base 2!!! @@ -73,17 +56,6 @@ #error Resource-Id Ueberlauf in #file, #line #endif -#define TEMPLATEPI_IDX_ALL 1 -#define TEMPLATEPI_IDX_USED 2 -#define TEMPLATEPI_IDX_USER 3 -#define TEMPLATEPI_IDX_AUTOMATIC 4 -#define TEMPLATEPI_IDX_TEXT 5 -#define TEMPLATEPI_IDX_CHAPTER 6 -#define TEMPLATEPI_IDX_LIST 7 -#define TEMPLATEPI_IDX_IDX 8 -#define TEMPLATEPI_IDX_EXTRA 9 - - #endif diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 7172770a5487..f206a5ce9cfe 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -38,13 +38,6 @@ #define STR_FMT_STD (RC_GLOBALS_BEGIN + 1) #define STR_LOAD_GLOBAL_DOC (RC_GLOBALS_BEGIN + 2) -#define STR_SEPARATOR (RC_GLOBALS_BEGIN + 4) - -#define STR_BASIC_IMPORT (RC_GLOBALS_BEGIN + 5) -#define STR_BASIC_BEGIN (RC_GLOBALS_BEGIN + 6) -#define STR_BASIC_END (RC_GLOBALS_BEGIN + 7) -#define STR_BASIC_REC_LIB (RC_GLOBALS_BEGIN + 8) -#define STR_TEMPLATE_WILDCARD (RC_GLOBALS_BEGIN + 9) #define STR_DOC_STAT (RC_GLOBALS_BEGIN + 10) #define STR_PAGE (RC_GLOBALS_BEGIN + 14) @@ -77,20 +70,6 @@ #define STR_LOAD_HTML_DOC (RC_GLOBALS_BEGIN + 37) -#define STR_AUTH (RC_GLOBALS_BEGIN + 38) -#define STR_TBL (RC_GLOBALS_BEGIN + 39) -#define STR_TOO (RC_GLOBALS_BEGIN + 40) -#define STR_TOILL (RC_GLOBALS_BEGIN + 41) - -// more Strings - -// BITMAPS ----------------------------------------------------------- - -#define RES_TABL (RC_GLOBALS_BEGIN + 1) -#define RES_TABR (RC_GLOBALS_BEGIN + 2) -#define RES_TABD (RC_GLOBALS_BEGIN + 3) -#define RES_TABC (RC_GLOBALS_BEGIN + 4) - // DIALOGS ----------------------------------------------------------- #define DLG_LISTBOX (RC_GLOBALS_BEGIN + 1) @@ -125,10 +104,6 @@ #define FN_END_OF_PREV_PAGE_SEL (RC_GLOBALS_BEGIN + 12) // ??? #define FN_START_OF_PAGE_SEL (RC_GLOBALS_BEGIN + 13) // StartOfPage #define FN_END_OF_PAGE_SEL (RC_GLOBALS_BEGIN + 14) // EndOfPage -#define FN_START_OF_WINDOW_SEL (RC_GLOBALS_BEGIN + 15) // StartOfWindow -#define FN_END_OF_WINDOW_SEL (RC_GLOBALS_BEGIN + 16) // EndOfWindow -#define FN_START_OF_COLUMN_SEL (RC_GLOBALS_BEGIN + 17) // StartOfColumn -#define FN_END_OF_COLUMN_SEL (RC_GLOBALS_BEGIN + 18) // EndOfColumn #define FN_START_OF_PARA_SEL (RC_GLOBALS_BEGIN + 19) // StartOfPara #define FN_END_OF_PARA_SEL (RC_GLOBALS_BEGIN + 20) // EndOfPara #define FN_NEXT_WORD_SEL (RC_GLOBALS_BEGIN + 21) // NextWord @@ -136,24 +111,16 @@ #define FN_NEXT_SENT_SEL (RC_GLOBALS_BEGIN + 23) // NextSentence #define FN_PREV_SENT_SEL (RC_GLOBALS_BEGIN + 24) // PrevSentence -#define FN_START_OF_NEXT_COLUMN_SEL (RC_GLOBALS_BEGIN + 25) -#define FN_END_OF_NEXT_COLUMN_SEL (RC_GLOBALS_BEGIN + 26) -#define FN_START_OF_PREV_COLUMN_SEL (RC_GLOBALS_BEGIN + 27) -#define FN_END_OF_PREV_COLUMN_SEL (RC_GLOBALS_BEGIN + 28) #define FN_PAGEUP_SEL (RC_GLOBALS_BEGIN + 29) #define FN_PAGEDOWN_SEL (RC_GLOBALS_BEGIN + 30) // TABPAGES ----------------------------------------------------------- #define TP_PAGE_STD (RC_GLOBALS_BEGIN + 1) -#define TP_PAGE_EXT (RC_GLOBALS_BEGIN + 2) #define TP_PARA_STD (RC_GLOBALS_BEGIN + 3) #define TP_PARA_EXT (RC_GLOBALS_BEGIN + 4) -#define TP_FRAME_STD (RC_GLOBALS_BEGIN + 5) -#define TP_FRAME_EXT (RC_GLOBALS_BEGIN + 6) - #define TP_CHAR_STD (RC_GLOBALS_BEGIN + 7) #define TP_CHAR_EXT (RC_GLOBALS_BEGIN + 8) @@ -169,25 +136,12 @@ #define TP_FOOTER_PAGE (RC_GLOBALS_BEGIN + 17) #define TP_FOOTNOTE_PAGE (RC_GLOBALS_BEGIN + 18) -#define TP_OPTGENERAL_PAGE (RC_GLOBALS_BEGIN + 19) // Sfx-pages -#define TP_OPTSAVE_PAGE (RC_GLOBALS_BEGIN + 20) -#define TP_OPTPATH_PAGE (RC_GLOBALS_BEGIN + 21) -#define TP_OPTSPELL_PAGE (RC_GLOBALS_BEGIN + 22) // Sw-pages -#define SW_EDIT_OPTIONS_TDLG (RC_GLOBALS_BEGIN + 23) -#define SW_BROWSER_OPTIONS_TDLG (RC_GLOBALS_BEGIN + 24) #define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN + 25) #define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26) -#define TP_OPTCOLOR_PAGE (RC_GLOBALS_BEGIN + 27) - -#define SW_OPTIONS_TDLG (RC_GLOBALS_BEGIN + 28) -#define SW_OPTIONS_TDLG_ELEM (RC_GLOBALS_BEGIN + 29) -#define SW_OPTIONS_TDLG_PRINT (RC_GLOBALS_BEGIN + 30) #define TP_FRM_STD (RC_GLOBALS_BEGIN + 31) -#define TP_OPTGRID_PAGE (RC_GLOBALS_BEGIN + 33) - #define TP_FORMAT_TABLE (RC_GLOBALS_BEGIN + 34) #define TP_GRF_EXT (RC_GLOBALS_BEGIN + 35) @@ -201,7 +155,6 @@ #define TP_LAYOUT_OPT (RC_GLOBALS_BEGIN + 44) #define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) -#define TP_HTML_OPT (RC_GLOBALS_BEGIN + 46) #define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) #define TP_CONDCOLL (RC_GLOBALS_BEGIN + 48) @@ -210,20 +163,11 @@ #define TP_TABLE_TEXTFLOW (RC_GLOBALS_BEGIN + 52) -#define TP_AUTOFMT_BY_INPUT (RC_GLOBALS_BEGIN + 53) -#define TP_AUTOFMT_APPLY (RC_GLOBALS_BEGIN + 54) - #define TP_PARA_ALIGN (RC_GLOBALS_BEGIN + 55) #define TP_OPTTABLE_PAGE (RC_GLOBALS_BEGIN + 56) #define TP_NUMBER (RC_GLOBALS_BEGIN + 57) -#define DLG_NUM_BULLET (RC_GLOBALS_BEGIN + 58) -#define TP_PICK_SINGLE_NUM (RC_GLOBALS_BEGIN + 59) -#define TP_PICK_BULLET (RC_GLOBALS_BEGIN + 60) -#define TP_PICK_NUM (RC_GLOBALS_BEGIN + 61) -#define TP_PICK_BMP (RC_GLOBALS_BEGIN + 62) - #define TP_FLD_DB (RC_GLOBALS_BEGIN + 64) #define TP_FLD_DOKINF (RC_GLOBALS_BEGIN + 65) #define TP_FLD_VAR (RC_GLOBALS_BEGIN + 66) @@ -232,7 +176,6 @@ #define TP_FLD_REF (RC_GLOBALS_BEGIN + 69) #define TP_OPTSHDWCRSR (RC_GLOBALS_BEGIN + 70) -#define TP_NUM_OPTIONS (RC_GLOBALS_BEGIN + 71) #define TP_NUM_POSITION (RC_GLOBALS_BEGIN + 72) #define TP_NUMPARA (RC_GLOBALS_BEGIN + 73) @@ -245,10 +188,6 @@ #define TP_OPTCAPTION_PAGE (RC_GLOBALS_BEGIN + 78) #define DLG_SVXTEST_NUM_BULLET (RC_GLOBALS_BEGIN + 79) #define TP_OPTLOAD_PAGE (RC_GLOBALS_BEGIN + 80) -#define TP_INSERT_TOX (RC_GLOBALS_BEGIN + 81) -#define TP_TOX_FORM_ENTRY (RC_GLOBALS_BEGIN + 82) -#define TP_TOX_FORM_STYLES (RC_GLOBALS_BEGIN + 83) -#define DLG_INSERT_TOX_TABDLG (RC_GLOBALS_BEGIN + 84) #define TP_INSERT_SECTION (RC_GLOBALS_BEGIN + 85) #define DLG_INSERT_SECTION (RC_GLOBALS_BEGIN + 86) #define DLG_SECTION_PROPERTIES (RC_GLOBALS_BEGIN + 87) @@ -269,7 +208,6 @@ #define TP_SECTION_INDENTS (RC_GLOBALS_BEGIN + 102) #define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103) #define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104) -#define TP_TITLEPAGE (RC_GLOBALS_BEGIN + 105) #define TP_COMPARISON_OPT (RC_GLOBALS_BEGIN + 106) //maximum: RC_GLOBALS_BEGIN + 120 diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc index e68de680c243..b56b725a854a 100644 --- a/sw/inc/poolfmt.hrc +++ b/sw/inc/poolfmt.hrc @@ -276,13 +276,5 @@ #define STR_COLUMN_VALUESET_ITEM3 (RC_POOLNUMRULE_BEGIN + 13 ) #define STR_COLUMN_VALUESET_ITEM4 (RC_POOLNUMRULE_BEGIN + 14 ) //-----IAccessibility2 Impplementaton 2009 -//----------------- -// Paragraph styles -//----------------- -#define STR_POOLPARSTYLE_HEAD1 (STR_POOLPARSTYLE_BEGIN+ 0) -#define STR_POOLPARSTYLE_HEAD2 (STR_POOLPARSTYLE_BEGIN+ 1) -#define STR_POOLPARSTYLE_HEAD3 (STR_POOLPARSTYLE_BEGIN+ 2) -#define STR_POOLPARSTYLE_DEFAULT (STR_POOLPARSTYLE_BEGIN+ 3) -#define STR_POOLPARSTYLE_TEXTBODY (STR_POOLPARSTYLE_BEGIN+ 4) #endif diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc index 7bf40c39cb17..883bf2433da1 100644 --- a/sw/inc/rcid.hrc +++ b/sw/inc/rcid.hrc @@ -127,7 +127,7 @@ // Verzeichnisse #define RC_INDEX_BEGIN RC_INDEX -#define RC_INDEX_END (RC_INDEX + 99) +// RC_INDEX_END (RC_INDEX + 99) // #define RC_RIBBAR_BEGIN RC_RIBBAR @@ -141,14 +141,13 @@ #define RC_FMTUI_BEGIN RC_FMTUI #define RC_FMTUI_END (RC_FMTUI_BEGIN + 69) - // Grafik Dialoge #define RC_GRFDLG_BEGIN RC_GRFDLG -#define RC_GRFDLG_END (RC_GRFDLG_BEGIN + 99) +// RC_GRFDLG_END (RC_GRFDLG_BEGIN + 99) // ???? #define RC_FSTDLG_BEGIN RC_FSTDLG -#define RC_FSTDLG_END (RC_FSTDLG_BEGIN + 99) +// RC_FSTDLG_END (RC_FSTDLG_BEGIN + 99) // Rahmen Dialoge #define RC_FRMDLG_BEGIN RC_FRMDLG @@ -156,7 +155,7 @@ // Feld Dialoge #define RC_FLDDLG_BEGIN RC_FLDDLG -#define RC_FLDDLG_END (RC_FLDDLG_BEGIN + 149) +// RC_FLDDLG_END (RC_FLDDLG_BEGIN + 149) // Utilities UI #define RC_UTLUI_BEGIN RC_UTLUI @@ -181,7 +180,7 @@ // DBMgr #define RC_DBUI_BEGIN RC_DBUI -#define RC_DBUI_END (RC_DBUI + 99) +// RC_DBUI_END (RC_DBUI + 99) // Der Rest der Imp-Klassen #define RC_DOCHDL_BEGIN RC_DOCHDL @@ -189,56 +188,50 @@ // Zeichenvorlagen #define RC_POOLCHRFMT_BEGIN RC_POOLCHRFMT -#define RC_POOLCHRFMT_END (RC_POOLCHRFMT + 29) +// RC_POOLCHRFMT_END (RC_POOLCHRFMT + 29) #define RC_POOLCHRFMT_HTML_BEGIN RC_POOLHTMLCHRFMT -#define RC_POOLCHRFMT_HTML_END (RC_POOLHTMLCHRFMT+ 30) +// RC_POOLCHRFMT_HTML_END (RC_POOLHTMLCHRFMT+ 30) // Rahmenvorlagen #define RC_POOLFRMFMT_BEGIN RC_POOLFRMFMT -#define RC_POOLFRMFMT_END (RC_POOLFRMFMT + 20) +// RC_POOLFRMFMT_END (RC_POOLFRMFMT + 20) // Collections -#define RC_POOLTXTCOLL_BEGIN RC_POOLTXTCOLL #define RC_POOLCOLL_TEXT_BEGIN RC_POOLTXTCOLL -#define RC_POOLCOLL_TEXT_END (RC_POOLTXTCOLL + 19) +// RC_POOLCOLL_TEXT_END (RC_POOLTXTCOLL + 19) #define RC_POOLCOLL_LISTS_BEGIN (RC_POOLTXTCOLL + 20) -#define RC_POOLCOLL_LISTS_END (RC_POOLTXTCOLL + 69) +// RC_POOLCOLL_LISTS_END (RC_POOLTXTCOLL + 69) #define RC_POOLCOLL_EXTRA_BEGIN (RC_POOLTXTCOLL + 70) -#define RC_POOLCOLL_EXTRA_END (RC_POOLTXTCOLL + 89) +// RC_POOLCOLL_EXTRA_END (RC_POOLTXTCOLL + 89) #define RC_POOLCOLL_REGISTER_BEGIN (RC_POOLTXTCOLL + 90) -#define RC_POOLCOLL_REGISTER_END (RC_POOLTXTCOLL + 119) +// RC_POOLCOLL_REGISTER_END (RC_POOLTXTCOLL + 119) #define RC_POOLCOLL_DOC_BEGIN (RC_POOLTXTCOLL + 130) -#define RC_POOLCOLL_DOC_END (RC_POOLTXTCOLL + 139) +// RC_POOLCOLL_DOC_END (RC_POOLTXTCOLL + 139) #define RC_POOLCOLL_HTML_BEGIN (RC_POOLTXTCOLL + 140) #define RC_POOLCOLL_HTML_END (RC_POOLTXTCOLL + 169) -#define RC_POOLTXTCOLL_END RC_POOLCOLL_HTML_END // Poolvorlagen Seite #define RC_POOLPAGEDESC_BEGIN RC_POOLPAGEDESC -#define RC_POOLPAGEDESC_END (RC_POOLPAGEDESC + 10) +// RC_POOLPAGEDESC_END (RC_POOLPAGEDESC + 10) // Poolvorlagen Numerierung #define RC_POOLNUMRULE_BEGIN RC_POOLNUMRULE -#define RC_POOLNUMRULE_END (RC_POOLNUMRULE + 10) +// RC_POOLNUMRULE_END (RC_POOLNUMRULE + 10) -// Pooltemplate Paragraph -#define STR_POOLPARSTYLE_BEGIN STR_POOLPARSTYLE -#define STR_POOLPARSTYLE_END (STR_POOLPARSTYLE + 9) +// free: STR_POOLPARSTYLE to (STR_POOLPARSTYLE + 9) // Envelp-Verzeichnis #define RC_ENVELP_BEGIN (RC_ENVELP ) -#define RC_ENVELP_END (RC_ENVELP + 99) +// RC_ENVELP_END (RC_ENVELP + 99) -// Statuszeile mit Laufbalken -#define RC_STATLIN_STR_BEGIN (RC_STATLIN_STR) -#define RC_STATLIN_STR_END (RC_STATLIN_STR + 49) +// free: RC_STATLIN_STR_BEGIN to (RC_STATLIN_STR + 49) // Gemeinsame Core-Strings #define RC_COMCORE_BEGIN (RC_COMMON_CORE) -#define RC_COMCORE_END (RC_COMMON_CORE + 59) +// RC_COMCORE_END (RC_COMMON_CORE + 59) // Shell-Verzeichnis #define RC_SHELLS_BEGIN RC_SHELLS @@ -248,26 +241,21 @@ #define RC_POPUPS_BEGIN RC_POPUPS #define RC_POPUPS_END (RC_POPUPS + 99) -// Strings fuer ConfigItems in div. Verzeichnissen -#define RC_CFGITEMS_BEGIN RC_CFGITEMS -#define RC_CFGITEMS_END (RC_CFGITEMS + 99) +// free: RC_CFGITEMS_BEGIN to (RC_CFGITEMS + 99) // Lingu #define RC_LINGU_BEGIN RC_LINGU -#define RC_LINGU_END (RC_LINGU + 99) +// RC_LINGU_END (RC_LINGU + 99) // Accessibility #define RC_ACCESS_BEGIN RC_ACCESS #define RC_ACCESS_END (RC_ACCESS + 99) -// Undos -#define RC_UNDO_BEGIN RC_UNDO -#define RC_UNDO_END (RC_UNDO + 199) +// free: RC_UNDO to (RC_UNDO + 199) -// SMARTTAGS // Smarttags #define RC_SMARTTAG_BEGIN RC_SMARTTAG -#define RC_SMARTTAG_END (RC_SMARTTAG + 99) +// RC_SMARTTAG_END (RC_SMARTTAG + 99) // unocore #define RC_UNOCORE_BEGIN RC_UNOCORE diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index eee3e3ce1236..102a96828c89 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -73,9 +73,6 @@ #define STR_PASTE_CLIPBOARD_UNDO (UNDO_BASE +40) #define STR_TYPING_UNDO (UNDO_BASE +41) -#define STR_REPEAT_DUMMY_6 (UNDO_BASE +42) -#define STR_REPEAT_DUMMY_7 (UNDO_BASE +43) -#define STR_REPEAT_DUMMY_8 (UNDO_BASE +44) #define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) // !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!! #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// !!!! umsetzen !!! @@ -181,6 +178,4 @@ #define STR_UNDO_NLS (UNDO_MORE_STRINGS_BEGIN + 2) #define STR_UNDO_PAGEBREAKS (UNDO_MORE_STRINGS_BEGIN + 3) #define STR_UNDO_COLBRKS (UNDO_MORE_STRINGS_BEGIN + 4) -#define STR_UNDO_SPECIALCHAR (UNDO_MORE_STRINGS_BEGIN + 5) -#define UNDO_ACT_END STR_UNDO_TABLE_NAME diff --git a/sw/source/ui/chrdlg/chardlg.hrc b/sw/source/ui/chrdlg/chardlg.hrc index 48a661bfebec..20d340ba50b3 100644 --- a/sw/source/ui/chrdlg/chardlg.hrc +++ b/sw/source/ui/chrdlg/chardlg.hrc @@ -24,48 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define FONT_FT 1 -#define FONT_CB 2 -#define FACE_FT 3 -#define FACE_LB 4 #define SIZE_FT 5 -#define SIZE_CB 6 -#define OUTLINE_TB 7 -#define SHADOW_TB 8 -#define UNDERL_TB 9 -#define STRIKETHRU_TB 10 -#define COLOR_FT 11 #define COLOR_LB 12 -#define LANG_FT 13 -#define LANG_LB 14 -#define EXAMPLE_WN 15 -#define EXAMPLE_FL 16 -#define CASEMAP_FL 17 -#define NONE_RB 20 #define CAPS_RB 21 -#define LOWERCASE_RB 22 -#define SMALLCAPS_RB 23 -#define TITEL_RB 24 -#define HIGH_RB 25 -#define NORMAL_RB 26 -#define DEEP_RB 27 -#define DEEPHIGHT_FT 28 -#define DEEPHIGH_MF 29 -#define RELSIZE_FT 30 -#define RELSIZE_MF 31 -#define KERN_LB 32 -#define KERN_FT 33 -#define KERN_MF 34 -#define UNDERLINE_FT 35 -#define UNDERLINE_LB 36 -#define STRIKE_FT 37 -#define STRIKE_LB 38 -#define STRIKE_CB 39 -#define EFFECT_FL 41 -#define POS_FL 42 -#define POSEXT_FL 43 -#define KERN_FL 45 -#define FONTTYPE_FT 46 #define FL_URL 50 #define FT_URL 51 diff --git a/sw/source/ui/chrdlg/paradlg.hrc b/sw/source/ui/chrdlg/paradlg.hrc index e8e48dfaa956..c6c514e7b7cf 100644 --- a/sw/source/ui/chrdlg/paradlg.hrc +++ b/sw/source/ui/chrdlg/paradlg.hrc @@ -25,47 +25,10 @@ * ************************************************************************/ #define TAB_CONTROL 55 -#define INDENT_FRM 1 -#define LEFT_LABEL 2 -#define FLINE_LABEL 3 -#define RIGHT_LABEL 4 -#define LEFT_INDENT 5 -#define FLINE_INDENT 6 -#define RIGHT_INDENT 7 #define DIST_FRM 8 -#define TOP_LABEL 9 #define TOP_DIST 10 -#define BOTTOM_LABEL 11 #define BOTTOM_DIST 12 -#define ALG_LEFT 13 -#define ALG_RIGHT 50 -#define ALG_CENTER 51 -#define ALG_JUSTIFY 52 -#define ALG_FRM 14 -#define LINEDIST_FRM 15 -#define LINEDIST_BOX 16 -#define LINEDIST_AT_LABEL 17 -#define LINEDIST_AT_PERCENTBOX 18 -#define LINEDIST_AT_METRICBOX 19 -#define HYPHEN_FRM 21 #define HYPHEN_BOX_AFTER 44 #define HYPHEN_BOX_BEFORE 22 -#define EXTHYPHEN_BOX_AFTER 42 -#define EXTHYPHEN_BOX_BEFORE 23 -#define HYPHEN_LABEL_AFTER 43 -#define HYPHEN_LABEL_BEFORE 24 -#define EXTEND_FRM 25 -#define PAGEBREAK_BOX 26 -#define PAGEBREAK_DAVOR 27 -#define PAGEBREAK_DAHINTER 28 -#define KEEP_TOGETHER_BOX 29 -#define WIDOW_BOX 31 -#define WIDOW_ROW_NO 32 -#define WIDOW_ROW_LABEL 33 -#define ORPHAN_BOX 34 -#define ORPHAN_ROW_NO 35 -#define ORPHAN_ROW_LABEL 36 -#define PAGE_COLL_BTN 40 -#define PAGE_COLL_BOX 41 #define OK_BTN 50 #define CANCEL_BTN 51 diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc index 33209779ed0c..09a4260c0eb1 100644 --- a/sw/source/ui/config/config.hrc +++ b/sw/source/ui/config/config.hrc @@ -32,30 +32,11 @@ // dialogs for configuration // strings for configuration -#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0) -#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1) -#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2) -#define DLG_CONFIG_SAVE (RC_CONFIG_BEGIN + 3) -#define DLG_CONFIG_PATH (RC_CONFIG_BEGIN + 4) -#define DLG_CONFIG_MENU (RC_CONFIG_BEGIN + 5) -#define DLG_CONFIG_KEY (RC_CONFIG_BEGIN + 6) -#define DLG_CONFIG_TOOLBOX (RC_CONFIG_BEGIN + 7) -#define DLG_CONFIG_COLOR (RC_CONFIG_BEGIN + 8) -#define DLG_TBSEL (RC_CONFIG_BEGIN + 9) -#define DLG_CFGSEL (RC_CONFIG_BEGIN + 10) -#define DLG_CONFIG (RC_CONFIG_BEGIN + 11) -#define DLG_MAC_ASSIGN (RC_CONFIG_BEGIN + 12) -#define MSG_DOUBLE_MENU_ID (RC_CONFIG_BEGIN + 13) -#define MSG_DOUBLE_ID (RC_CONFIG_BEGIN + 14) -#define DLG_SYMBOL_SELECT (RC_CONFIG_BEGIN + 15) -#define DLG_CONFIG_GRID (RC_CONFIG_BEGIN + 16) -#define DLG_CONFIG_ADDR (RC_CONFIG_BEGIN + 17) #define DLG_MM_TESTACCOUNTSETTINGS (RC_CONFIG_BEGIN + 19) #define DLG_MM_SERVERAUTHENTICATION (RC_CONFIG_BEGIN + 20) -#define STR_ERROR_PATH (RC_CONFIG_BEGIN + 25) #define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26) #define CONFIG_ACT_END STR_ARR_METRIC diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc index 1da9f06f7e35..12cb0e1c4a74 100644 --- a/sw/source/ui/config/optdlg.hrc +++ b/sw/source/ui/config/optdlg.hrc @@ -50,24 +50,12 @@ #define FL_LINE 22 #define CB_POSTIT 23 #define CB_VRULER_RIGHT 24 -#define CB_BIGHANDLE 25 #define FL_SETTINGS 26 #define LB_METRIC 27 #define FT_METRIC 28 //test tab page -#define CB_TEST1 25 -#define CB_TEST2 26 -#define CB_TEST3 27 -#define CB_TEST4 28 -#define CB_TEST5 29 -#define CB_TEST6 30 -#define CB_TEST7 31 -#define CB_TEST8 32 -#define CB_TEST9 33 -#define CB_TEST10 34 -#define FL_TEST 35 #define CB_FLD_HIDDEN_PARA 36 // right in the middle of it, so that HelpIds stay compatible to FPII #define CB_SMOOTH_SCROLL 37 @@ -75,21 +63,14 @@ #define BT_OK 38 #define BT_CANCEL 39 #define BT_MORE 40 -#define BT_GRID 41 -#define MF_HFRAME 42 -#define MF_VFRAME 43 #define CB_INDEX 44 #define LB_COLOR 50 -#define WIN_COLOR 52 -#define ED_COLORNAME 53 #define BT_EDIT 55 #define BT_NEW 56 #define BT_DELETE 57 #define BT_DEFAULT 58 -#define CB_HANDLE 59 -#define CB_SECT_BOUNDS 60 #define CB_CHAR_HIDDEN 61 // Print-Extra-Page #define CB_PGRF 61 @@ -179,21 +160,13 @@ #define FT_VAR 126 #define FT_MOVE 128 -#define FL_COLOR 130 -#define FT_SGML 131 -#define LB_SGML 132 #define FT_COMMENT 133 -#define LB_COMMENT 134 -#define FT_KEYWD 135 -#define LB_KEYWD 136 #define FT_UNKNOWN 137 -#define LB_UNKNOWN 138 #define FL_TABLE_SEPARATOR 139 #define CB_PROSPECT_RTL 140 #define FL_SHDWCRSFLAG 1 #define CB_SHDWCRSONOFF 2 -#define FL_SHDWCRSMODE 3 #define FT_SHDWCRSFILLMODE 4 #define RB_SHDWCRSFILLMARGIN 5 #define RB_SHDWCRSFILLINDENT 6 diff --git a/sw/source/ui/dbui/mmoutputpage.hrc b/sw/source/ui/dbui/mmoutputpage.hrc index f8daf2734b0c..92bd1c3b0e51 100644 --- a/sw/source/ui/dbui/mmoutputpage.hrc +++ b/sw/source/ui/dbui/mmoutputpage.hrc @@ -48,7 +48,6 @@ #define LB_PRINT 22 #define PB_PRINTERSETTINGS 23 #define RB_PRINTALL 24 -#define RB_PRINTCURRENT 25 #define PB_PRINTNOW 26 #define ST_SAVESTART 27 #define ST_SAVEMERGED 28 diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/ui/dialog/regionsw.hrc index b9d027fa6398..c56c9b5196b4 100644 --- a/sw/source/ui/dialog/regionsw.hrc +++ b/sw/source/ui/dialog/regionsw.hrc @@ -51,7 +51,6 @@ #define ED_RANAME 19 #define ED_RNAME 20 #define FT_CONDITION 21 -#define FL_EDIT_OPTIONS 22 #define FLD_END_OFFSET 23 #define FLD_FTN_OFFSET 24 #define FT_DDE 25 @@ -62,7 +61,6 @@ #define FT_FTN_OFFSET 30 #define FT_FTN_PREFIX 31 #define FT_FTN_SUFFIX 32 -#define FT_RNAME 33 #define FT_SUBREG 34 #define LB_END_NUMVIEW 36 #define LB_FTN_NUMVIEW 37 @@ -72,7 +70,6 @@ #define PB_HELP 41 #define PB_OK 42 #define PB_OPTIONS 43 -#define PB_SAVED 44 #define ST_INSERT 45 #define TLB_SECTION 46 #define FL_NAME 47 @@ -91,7 +88,6 @@ #define STR_REG_DUPLICATE (RC_REGIONSW_BEGIN+6) #define STR_INFO_DUPLICATE (RC_REGIONSW_BEGIN+7) -#define MD_INS_REGION (RC_REGIONSW_BEGIN+8) #define MD_EDIT_REGION (RC_REGIONSW_BEGIN+9) #define QB_CONNECT (RC_REGIONSW_BEGIN+10) #define REG_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) diff --git a/sw/source/ui/dialog/wordcountdialog.hrc b/sw/source/ui/dialog/wordcountdialog.hrc index 0db5c87b970f..af6f3a79c76c 100644 --- a/sw/source/ui/dialog/wordcountdialog.hrc +++ b/sw/source/ui/dialog/wordcountdialog.hrc @@ -43,6 +43,5 @@ #define FL_BOTTOM 15 #define PB_OK 16 #define PB_HELP 17 -#define WINDOW_DLG 18 #endif diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc index 4b563068cb66..5a854e3c586a 100644 --- a/sw/source/ui/envelp/label.hrc +++ b/sw/source/ui/envelp/label.hrc @@ -53,8 +53,6 @@ #define BTN_INSERT 19 #define BTN_SYNC 20 -#define RB_FROM_AUTO_TEXT 1 -#define RB_FROM_EDIT 2 #define LB_AUTO_TEXT 3 #define FT_AUTO_TEXT_GROUP 4 #define LB_AUTO_TEXT_GROUP 5 diff --git a/sw/source/ui/fldui/changedb.hrc b/sw/source/ui/fldui/changedb.hrc index bc90e9f453ee..66f05120f21a 100644 --- a/sw/source/ui/fldui/changedb.hrc +++ b/sw/source/ui/fldui/changedb.hrc @@ -33,7 +33,6 @@ #define FT_DESC 1 #define FT_DOCDBTEXT 2 #define FT_DOCDBNAME 3 -#define BT_CHANGEDB 4 #define FT_USEDDB 5 #define FT_AVAILDB 6 #define TLB_USEDDB 7 diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc index 9ad30e6673c0..61b89d1b3d86 100644 --- a/sw/source/ui/frmdlg/column.hrc +++ b/sw/source/ui/frmdlg/column.hrc @@ -27,7 +27,6 @@ #define FT_NUMBER 1 #define ED_NUMBER 2 #define FT_DISTANCE 3 -#define ED_DISTANCE 4 #define CB_AUTO_WIDTH 4 #define FL_COLUMNS 6 @@ -55,7 +54,6 @@ #define WN_BSP 41 -#define LB_REFERENCE 42 #define CB_REGISTER 43 #define FL_REGISTER 44 #define FT_REFERENCE 45 @@ -67,7 +65,6 @@ #define FT_WIDTH 49 #define FT_DIST 50 #define VS_DEFAULTS 51 -#define IL_PRE_COLS 52 #define FT_APPLY_TO 53 #define LB_APPLY_TO 54 diff --git a/sw/source/ui/frmdlg/cption.hrc b/sw/source/ui/frmdlg/cption.hrc index 1487171f0c01..8b8c7d19d018 100644 --- a/sw/source/ui/frmdlg/cption.hrc +++ b/sw/source/ui/frmdlg/cption.hrc @@ -30,7 +30,6 @@ #define BTN_OK 1 #define BTN_CANCEL 2 -#define TXT_SAMPLE 3 #define TXT_CATEGORY 4 #define BOX_CATEGORY 5 #define TXT_FORMAT 6 @@ -48,8 +47,6 @@ #define FT_SEPARATOR 18 #define ED_SEPARATOR 19 #define CB_COPY_ATTR 20 -#define FT_OBJECT_NAME 21 -#define ED_OBJECT_NAME 22 #define BTN_AUTOCAPTION 23 #define TXT_SEP 24 #define EDT_SEP 25 diff --git a/sw/source/ui/frmdlg/frmpage.hrc b/sw/source/ui/frmdlg/frmpage.hrc index ed58d821f032..f72c60a172ba 100644 --- a/sw/source/ui/frmdlg/frmpage.hrc +++ b/sw/source/ui/frmdlg/frmpage.hrc @@ -33,7 +33,6 @@ #define RB_ANCHOR_AS_CHAR 4 #define RB_ANCHOR_FRAME 5 #define WN_BSP 21 -#define FT_BSP 22 // SwFrmPage @@ -59,7 +58,6 @@ #define LB_VERT_RELATION 4 #define FL_POSITION 43 #define BT_REALSIZE 44 -#define BT_MANUAL 45 #define CB_AUTOWIDTH 46 #define FT_WIDTH_AUTO 47 #define FT_HEIGHT_AUTO 48 diff --git a/sw/source/ui/frmdlg/pattern.hrc b/sw/source/ui/frmdlg/pattern.hrc index f9eabe9bb3c5..f3c878dc84d3 100644 --- a/sw/source/ui/frmdlg/pattern.hrc +++ b/sw/source/ui/frmdlg/pattern.hrc @@ -25,21 +25,9 @@ * ************************************************************************/ -#define BRUSH_LBL 1 -#define BRUSH_LBOX 2 - #define COLOR_LBL 3 #define COLOR_LBOX 4 -#define FILLIN_COLOR_LBL 5 -#define FILLIN_COLOR_LBOX 6 - -#define NO_PATTERN_BOX 7 - -#define PATTERN_FRM 8 -#define EXAMPLE_FRM 9 -#define EXAMPLE_WIN 10 - #define OK_BTN 11 #define CANCEL_BTN 12 #define RESET_BTN 13 diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index 95356a5858c4..32a106c9e83a 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -30,9 +30,6 @@ #include "rcid.hrc" -// Document-Icon -#define RC_DOC_ICON (RC_APP_BEGIN + 2) - // Should the clipboard for other applications... #define MSG_CLPBRD_CLEAR (RC_APP_BEGIN + 3) @@ -57,24 +54,6 @@ #define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) // Strings for regions in the configuration -#define STR_GRP_FILE (RC_APP_BEGIN + 56) -#define STR_GRP_EDIT (RC_APP_BEGIN + 57) -#define STR_GRP_TRAVELLING (RC_APP_BEGIN + 58) -#define STR_GRP_VIEW (RC_APP_BEGIN + 59) -#define STR_GRP_INSERT (RC_APP_BEGIN + 60) -#define STR_GRP_FORMAT (RC_APP_BEGIN + 61) -#define STR_GRP_STYLE (RC_APP_BEGIN + 62) -#define STR_GRP_TEXT (RC_APP_BEGIN + 63) -#define STR_GRP_FRAME (RC_APP_BEGIN + 64) -#define STR_GRP_GRAPHIC (RC_APP_BEGIN + 65) -#define STR_GRP_TABLE (RC_APP_BEGIN + 66) -#define STR_GRP_TOOLS (RC_APP_BEGIN + 67) -#define STR_GRP_NUMBERING (RC_APP_BEGIN + 68) -#define STR_GRP_WINDOW (RC_APP_BEGIN + 69) -#define STR_GRP_MISC (RC_APP_BEGIN + 70) -#define STR_GRP_MACRO (RC_APP_BEGIN + 71) -#define RES_EXT_HELP_STRING (RC_APP_BEGIN + 72) -#define RES_STD_HELP_STRING (RC_APP_BEGIN + 73) #define STR_PAGEOFFSET (RC_APP_BEGIN + 74) #define STR_PAGEBREAK (RC_APP_BEGIN + 75) #define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) @@ -89,7 +68,6 @@ #define PB_MERGE_CANCEL 3 #define IMG_MERGE 4 -#define SID_TOGGLETOOLBOX (RC_APP_BEGIN + 89) #define STR_ENV_TITLE (RC_APP_BEGIN + 91) #define STR_LAB_TITLE (RC_APP_BEGIN + 92) diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/ui/inc/frmui.hrc index 4c71fff51b40..5d516732053c 100644 --- a/sw/source/ui/inc/frmui.hrc +++ b/sw/source/ui/inc/frmui.hrc @@ -31,43 +31,24 @@ #include "rcid.hrc" #include "globals.hrc" -#define DLG_FRMOPT (RC_FRMDLG_BEGIN + 1) -#define DLG_PATTERN (RC_FRMDLG_BEGIN + 2) #define DLG_BORDER (RC_FRMDLG_BEGIN + 3) #define DLG_COLUMN (RC_FRMDLG_BEGIN + 4) -#define DLG_FOOTNOTE (RC_FRMDLG_BEGIN + 5) -#define DLG_INSERT_FOOTNOTE (RC_FRMDLG_BEGIN + 6) -#define DLG_VIEW_HEADER (RC_FRMDLG_BEGIN + 8) -#define DLG_FORMAT_COLUMN (RC_FRMDLG_BEGIN + 10) #define DLG_CAPTION (RC_FRMDLG_BEGIN + 11) #define DLG_SEQUENCE_OPTION (RC_FRMDLG_BEGIN + 12) #define TP_FOOTNOTEOPTION (RC_FRMDLG_BEGIN + 12) #define TP_ENDNOTEOPTION (RC_FRMDLG_BEGIN + 13) -#define STR_PATTERN_BRD (RC_FRMDLG_BEGIN + 13) -#define STR_SHPATTERN (RC_FRMDLG_BEGIN + 14) -#define STR_LNPATTERN (RC_FRMDLG_BEGIN + 15) #define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16) #define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17) #define STR_FRMUI_WRAP (RC_FRMDLG_BEGIN + 18) -#define BMP_PORTRAIT (RC_FRMDLG_BEGIN + 16) -#define BMP_LANDSCAPE (RC_FRMDLG_BEGIN + 17) #define BMP_BEGIN (RC_FRMDLG_BEGIN + 18) -#define BMP_WRAP (BMP_BEGIN) -#define BMP_LEFT (BMP_BEGIN+1) -#define BMP_RIGHT (BMP_BEGIN+2) -#define BMP_OPAQUE (BMP_BEGIN+3) -#define BMP_OPAQUET (BMP_BEGIN+4) #define BMP_NOWRAP (BMP_BEGIN+5) #define BMP_END (BMP_NOWRAP) -#define MN_OPTION (BMP_END + 1) -#define MN_COLUMN (BMP_END + 2) -#define MN_PAPERSZ (BMP_END + 3) #define MN_BACKGROUND (BMP_END + 4) #define STR_BACKGROUND (BMP_END + 6) @@ -76,50 +57,11 @@ #define STR_FRMDLG_BEGIN (MN_FOOTNOTE + 1) #define STR_TOPPRT (STR_FRMDLG_BEGIN + 1) -//#define STR_FROMBOTTOM (STR_FRMDLG_BEGIN + 2) -//#define STR_FROMTOP (STR_FRMDLG_BEGIN + 3) -//#define STR_BELOW (STR_FRMDLG_BEGIN + 4) -/* -#define STR_LEFT (STR_FRMDLG_BEGIN + 5) -#define STR_RIGHT (STR_FRMDLG_BEGIN + 6) -#define STR_FROMLEFT (STR_FRMDLG_BEGIN + 7) -#define STR_MIR_LEFT (STR_FRMDLG_BEGIN + 8) -#define STR_MIR_RIGHT (STR_FRMDLG_BEGIN + 9) -#define STR_MIR_FROMLEFT (STR_FRMDLG_BEGIN + 10) -*/ #define STR_BORDER (STR_FRMDLG_BEGIN + 16) #define STR_COLUMN (STR_FRMDLG_BEGIN + 17) -#define STR_PARA (STR_FRMDLG_BEGIN + 18) #define STR_CHAR (STR_FRMDLG_BEGIN + 19) -/* -#define STR_FRAME (STR_FRMDLG_BEGIN + 20) -#define STR_PRTAREA (STR_FRMDLG_BEGIN + 21) -#define STR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 22) -#define STR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 23) -#define STR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 24) -#define STR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 25) -#define STR_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 26) -#define STR_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 27) -#define STR_MIR_REL_FRM_LEFT (STR_FRMDLG_BEGIN + 28) -#define STR_MIR_REL_FRM_RIGHT (STR_FRMDLG_BEGIN + 29) -#define STR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 30) -#define STR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 31) -#define STR_REL_BASE (STR_FRMDLG_BEGIN + 32) -#define STR_REL_CHAR (STR_FRMDLG_BEGIN + 33) -#define STR_REL_ROW (STR_FRMDLG_BEGIN + 34) -#define STR_REL_BORDER (STR_FRMDLG_BEGIN + 35) -#define STR_REL_PRTAREA (STR_FRMDLG_BEGIN + 36) -#define STR_FLY_REL_PG_LEFT (STR_FRMDLG_BEGIN + 37) -#define STR_FLY_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 38) -#define STR_FLY_REL_PG_FRAME (STR_FRMDLG_BEGIN + 39) -#define STR_FLY_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 40) -#define STR_FLY_MIR_REL_PG_LEFT (STR_FRMDLG_BEGIN + 41) -#define STR_FLY_MIR_REL_PG_RIGHT (STR_FRMDLG_BEGIN + 42) -#define STR_FLY_MIR_REL_PG_FRAME (STR_FRMDLG_BEGIN + 43) -#define STR_FLY_MIR_REL_PG_PRTAREA (STR_FRMDLG_BEGIN + 44)*/ - #define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45) #define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46) #define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47) diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/ui/inc/globdoc.hrc index cf06e4de05ca..06976a205184 100644 --- a/sw/source/ui/inc/globdoc.hrc +++ b/sw/source/ui/inc/globdoc.hrc @@ -35,21 +35,7 @@ #define STR_WRITER_GLOBALDOC_FULLTYPE_50 (RC_GLOBDOC_BEGIN + 4) #define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) -#define MN_GLOBALFILE (RC_GLOBDOC_BEGIN + 30) -#define MN_GLOBALEDIT (RC_GLOBDOC_BEGIN + 31) -#define MN_GLOBALVIEW (RC_GLOBDOC_BEGIN + 32) -#define MN_GLOBALINS (RC_GLOBDOC_BEGIN + 33) -#define MN_GLOBALFORMAT (RC_GLOBDOC_BEGIN + 34) -#define MN_GLOBALEXTRA (RC_GLOBDOC_BEGIN + 35) -#define MN_GLOBALWIN (RC_GLOBDOC_BEGIN + 36) -#define MN_GLOBALFILE_PORT (RC_GLOBDOC_BEGIN + 47) -#define MN_GLOBALEDIT_PORT (RC_GLOBDOC_BEGIN + 48) -#define MN_GLOBALVIEW_PORT (RC_GLOBDOC_BEGIN + 49) -#define MN_GLOBALINS_PORT (RC_GLOBDOC_BEGIN + 50) -#define MN_GLOBALFORMAT_PORT (RC_GLOBDOC_BEGIN + 51) -#define MN_GLOBALEXTRA_PORT (RC_GLOBDOC_BEGIN + 52) -#define MN_GLOBALWIN_PORT (RC_GLOBDOC_BEGIN + 53) #define MN_GLOBAL_TEXT_POPUPMENU (RC_GLOBDOC_BEGIN + 63) // ------------------------------------------------------------------------ diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc index 39f33d39d677..059d02d975d8 100644 --- a/sw/source/ui/inc/misc.hrc +++ b/sw/source/ui/inc/misc.hrc @@ -30,32 +30,20 @@ #include "rcid.hrc" -#define DLG_QUERY_DELETE (RC_MISC_BEGIN + 2) -#define DLG_MASTERDOC_PAGE (RC_MISC_BEGIN + 3) -#define DLG_QUERY_ADD (RC_MISC_BEGIN + 4) #define STR_GLOSSARY_BIB_DLG (RC_MISC_BEGIN + 5) -#define STR_DOCUMENT_BIB_DLG (RC_MISC_BEGIN + 6) -#define WIN_GLOBAL_DOC (RC_MISC_BEGIN + 7) -#define DLG_GLOBAL_DOC_OPTION (RC_MISC_BEGIN + 8) -#define DLG_NUMBERING (RC_MISC_BEGIN + 9) #define DLG_ZOOM (RC_MISC_BEGIN + 10) #define DLG_GLOSSARY (RC_MISC_BEGIN + 11) #define DLG_INS_FOOTNOTE (RC_MISC_BEGIN + 12) #define DLG_DOC_FOOTNOTE (RC_MISC_BEGIN + 13) -#define DLG_PG_FOOTNOTE (RC_MISC_BEGIN + 14) -#define DLG_NUMBERING_OUTLINE (RC_MISC_BEGIN + 15) #define DLG_BIB_BASE (RC_MISC_BEGIN + 16) #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) #define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) #define DLG_SORTING (RC_MISC_BEGIN + 19) #define DLG_CHARMAP (RC_MISC_BEGIN + 20) -#define DLG_AUTOCORR (RC_MISC_BEGIN + 23) -#define DLG_AUTOFMT_OPT (RC_MISC_BEGIN + 24) #define DLG_RENAME_GLOS (RC_MISC_BEGIN + 25) -#define DLG_AUTOFMT_TAB (RC_MISC_BEGIN + 26) #define DLG_PRCNT_SET (RC_MISC_BEGIN + 27) #define DLG_INSERT_RULER (RC_MISC_BEGIN + 28) #define DLG_REDLINE_ACCEPT (RC_MISC_BEGIN + 29) @@ -70,8 +58,6 @@ #define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) #define MSG_NO_GLOSSARIES (RC_MISC_BEGIN + 34) -#define MSG_BLOCK_CREATE_ERR (RC_MISC_BEGIN + 40) -#define MSG_BLOCK_DELETE_ERR (RC_MISC_BEGIN + 41) #define MSG_SRTERR (RC_MISC_BEGIN + 42) #define STR_GLOSSARY (RC_MISC_BEGIN + 43) @@ -89,10 +75,7 @@ #define STR_FULLNUMS_7 (STR_FULLNUMS_START + 6) #define STR_FULLNUMS_8 (STR_FULLNUMS_START + 7) -#define STR_BULLET_THEME (RC_MISC_BEGIN + 55) -#define MSG_NO_BULLETS (RC_MISC_BEGIN + 56) -#define STR_NUMRULE_UNKNOWN (RC_MISC_BEGIN + 60) #define MN_REDLINE_POPUP (RC_MISC_BEGIN + 61) #define STR_REMOVE_WARNING (RC_MISC_BEGIN + 62) #define STRRES_NUMTYPES (RC_MISC_BEGIN + 63) diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/ui/inc/popup.hrc index 7edb6dadeecc..7bdd5f503e8c 100644 --- a/sw/source/ui/inc/popup.hrc +++ b/sw/source/ui/inc/popup.hrc @@ -41,12 +41,8 @@ #define MN_SRCVIEW_POPUPMENU (RC_POPUPS_BEGIN + 8) #define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9) #define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10) -#define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11) -#define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12) -#define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13) #define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14) #define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15) -#define MN_REDCOMMENT_POPUPMENU (RC_POPUPS_BEGIN + 16) #define MN_REDCOMMENT_BUTTON (RC_POPUPS_BEGIN + 17) #define MN_HEADERFOOTER_BUTTON (RC_POPUPS_BEGIN + 18) #define MN_PAGEBREAK_BUTTON (RC_POPUPS_BEGIN + 19) diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc index a2788ced07b8..276efa648d9d 100644 --- a/sw/source/ui/inc/ribbar.hrc +++ b/sw/source/ui/inc/ribbar.hrc @@ -36,30 +36,14 @@ #define MN_FORM4 4 #define MN_FORM5 5 -#define WIN_RIBBAR RC_RIBBAR_BEGIN - #define CB_FORMAT (RC_RIBBAR_BEGIN +1) -#define CB_FONT (RC_RIBBAR_BEGIN +2) #define CB_SIZE (RC_RIBBAR_BEGIN +3) #define PB_FORMULA_OK (RC_RIBBAR_BEGIN +4) #define PB_FORMULA_CANCEL (RC_RIBBAR_BEGIN +5) -#define BMP_OK PB_FORMULA_OK -#define BMP_CANCEL PB_FORMULA_CANCEL #define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6) #define FT_POS (RC_RIBBAR_BEGIN +7) -#define BT_FORMULA (RC_RIBBAR_BEGIN +8) #define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +9) -#define STR_BACKGROUND_PATTERN (RC_RIBBAR_BEGIN + 10) -#define STR_BACKGROUND_COLOR (RC_RIBBAR_BEGIN + 11) -#define STR_BORDER_COLOR (RC_RIBBAR_BEGIN + 12) -#define STR_BORDER_STYLE (RC_RIBBAR_BEGIN + 13) -#define STR_BORDER_LINE (RC_RIBBAR_BEGIN + 14) -#define STR_TEXT_COLOR (RC_RIBBAR_BEGIN + 15) -#define STR_NUMLIST (RC_RIBBAR_BEGIN + 16) - -#define STR_HELP_TOOLBOX_TOGGLE (RC_RIBBAR_BEGIN + 17) - #define RID_DRAW_WIN (RC_RIBBAR_BEGIN + 18) #define RID_CNTRLR_WIN (RC_RIBBAR_BEGIN + 19) #define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20) @@ -67,7 +51,6 @@ //Resourcen fuer Inputwin (Rechenleiste) #define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) -#define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) #define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 26) #define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30) #define RID_PVIEW_ZOOM_LB (RC_RIBBAR_BEGIN + 31) diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc index c5b2d0255850..7e97fb6dc4dd 100644 --- a/sw/source/ui/inc/utlui.hrc +++ b/sw/source/ui/inc/utlui.hrc @@ -150,7 +150,6 @@ #define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) #define DLG_NAVIGATION_PI (RC_UTLUI_BEGIN + 1) -#define DLG_ADDR_PI (RC_UTLUI_BEGIN + 2) #define DLG_GLOSSARY_DECIDE_DLG (RC_UTLUI_BEGIN + 3) #define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4) diff --git a/sw/source/ui/inc/web.hrc b/sw/source/ui/inc/web.hrc index e9e446d62cdb..f77386cb285d 100644 --- a/sw/source/ui/inc/web.hrc +++ b/sw/source/ui/inc/web.hrc @@ -30,7 +30,6 @@ #include "rcid.hrc" -#define RC_WEB_ICON (RC_WEB_BEGIN + 1) #define RID_WEBTOOLS_TOOLBOX (RC_WEB_BEGIN + 2) #define RID_WEBTEXT_TOOLBOX (RC_WEB_BEGIN + 3) #define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4) @@ -43,29 +42,9 @@ #define RID_WEBOLE_TOOLBOX (RC_WEB_BEGIN + 11) #define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) - -#define MN_WEBFILE (RC_WEB_BEGIN + 30) -#define MN_WEBEDIT (RC_WEB_BEGIN + 31) -#define MN_WEBVIEW (RC_WEB_BEGIN + 32) -#define MN_WEBINS (RC_WEB_BEGIN + 33) -#define MN_WEBFORMAT (RC_WEB_BEGIN + 34) -#define MN_WEBEXTRA (RC_WEB_BEGIN + 35) -#define MN_WEBWIN (RC_WEB_BEGIN + 36) - -#define MN_WEB_TEXT_POPUPMENU (RC_WEB_BEGIN + 46) - -#define MN_WEBFILE_PORT (RC_WEB_BEGIN + 47) -#define MN_WEBEDIT_PORT (RC_WEB_BEGIN + 48) -#define MN_WEBVIEW_PORT (RC_WEB_BEGIN + 49) -#define MN_WEBINS_PORT (RC_WEB_BEGIN + 50) -#define MN_WEBFORMAT_PORT (RC_WEB_BEGIN + 51) -#define MN_WEBEXTRA_PORT (RC_WEB_BEGIN + 52) -#define MN_WEBWIN_PORT (RC_WEB_BEGIN + 53) - // ------------------------------------------------------------------------ -#define WEB_ACT_END MN_WEBWIN_PORT - +#define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE #if WEB_ACT_END > RC_WEB_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc index b6170bf53176..9bde0d94571d 100644 --- a/sw/source/ui/index/cnttab.hrc +++ b/sw/source/ui/index/cnttab.hrc @@ -24,57 +24,24 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define CB_MARKS 4 -#define CB_OUTLN 5 #define FT_LEVEL 6 -#define ED_LEVEL 7 -#define FL_CREATE 8 -#define ED_BSP 11 -#define FL_BSP 12 -#define BT_OUTLN 13 #define FL_TITLE 14 #define ED_TITLE 15 #define BT_HELP 16 #define ST_AUTHTYPE 17 #define LB_ENTRY 20 -#define FT_NUM 21 #define ED_ENTRY 22 -#define BT_ENTRY_NUMBER 23 -#define BT_ENTRY_TEXT 24 -#define BT_TAB 25 #define BT_STD 26 -#define BT_PAGE 27 #define FL_ENTRY 28 -//#define FT_LEVEL 28 #define LB_LEVEL 29 #define FT_TEMPLATE 30 #define LB_PARALAY 31 #define BT_ASSIGN 32 #define FL_FORMAT 33 -#define BT_ENTRY 34 -//#define BT_EDIT 34 -#define BT_JUMP 35 -#define CB_RECALC_TABS 36 -#define CB_FIRST_TAB_POS 37 -#define MF_FIRST_TAB_POS 38 -#define CB_REL_TO_TEXT 39 #define BT_EDIT_STYLE 40 -#define CB_SAME 41 -#define CB_FF 42 #define CB_CASE 43 -#define CB_SEC 44 -#define CB_ALPHA 45 -#define FL_OPT 46 -#define CB_MAKRS 47 -#define DLB_TOD 48 -#define CB_TEMPL 49 -#define DLB_LAYOUT 50 #define CB_OBJECT 51 -#define DLB_OBJECT 52 -#define FL_SOURCE 53 -#define CB_USER_MARKS 54 -#define BT_ALL_LEVEL 55 #define FT_MAIN_ENTRY_STYLE 56 #define LB_MAIN_ENTRY_STYLE 57 @@ -128,14 +95,10 @@ #define CB_FILLCHAR 46 #define FT_CHAPTERENTRY 47 #define LB_CHAPTERENTRY 48 -#define FT_SORTING 49 -#define LB_SORTING 50 #define FT_TABPOS 51 #define MF_TABPOS 52 #define CB_AUTORIGHT 53 #define CB_RELTOSTYLE 54 -#define CB_RECALCTAB 56 -#define CB_NUMSTYLEFROMPDESC 57 #define CB_ALPHADELIM 58 #define CB_COMMASEPARATED 59 @@ -243,17 +206,7 @@ //TabDialog #define WIN_EXAMPLE 1 -#define RES_EXAMPLE_TEXT 2 -#define ST_HEADING_1 4 -#define ST_TEXT_1 5 -#define ST_HEADING_1_1 6 -#define ST_TEXT_1_1 7 -#define ST_HEADING_1_2 8 -#define ST_TEXT_1_2 9 -#define ST_TABLE_LABEL 10 -#define ST_FRAME_LABEL 11 -#define ST_GRAPHIC_LABEL 12 #define ST_USERDEFINEDINDEX 13 #define CB_SHOWEXAMPLE 14 diff --git a/sw/source/ui/lingu/olmenu.hrc b/sw/source/ui/lingu/olmenu.hrc index 73fbac09804f..d43ded4de33a 100644 --- a/sw/source/ui/lingu/olmenu.hrc +++ b/sw/source/ui/lingu/olmenu.hrc @@ -91,7 +91,6 @@ // id range for 'set language for all text' sub menu entries #define MN_SET_LANGUAGE_ALL_TEXT_START 1300 -#define MN_SET_LANGUAGE_ALL_TEXT_END (MN_SET_LANGUAGE_ALL_TEXT_START + MN_MAX_NUM_LANG) #endif diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc index dc55c5e9d61a..decb540d31bb 100644 --- a/sw/source/ui/misc/glossary.hrc +++ b/sw/source/ui/misc/glossary.hrc @@ -65,8 +65,6 @@ // Box library text blocks #define FL_EDIT 1 -#define FL_BIB 2 -#define ED_BIB 3 #define PB_NEW 10 #define PB_DELETE 11 diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc index 17dd3194f0bf..bc4e2bb25637 100644 --- a/sw/source/ui/misc/outline.hrc +++ b/sw/source/ui/misc/outline.hrc @@ -24,33 +24,17 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define RB_1 1 -#define RB_2 2 -#define RB_3 3 -#define RB_4 4 -#define RB_5 5 #define FT_1 6 #define FT_2 7 #define FT_3 8 #define FT_4 9 #define FT_5 10 -#define FI_1 11 -#define FI_2 12 -#define FI_3 13 -#define FI_4 14 -#define FI_5 15 -//#define FL_LEVEL 16 #define FT_COLL 20 #define LB_COLL 21 #define FT_NUMBER 22 #define LB_NUMBER 23 #define FT_DELIM 24 -#define FT_DELIM_BEVOR 25 -#define FT_DELIM_AFTER 26 -#define ED_DELIM_BEVOR 27 -#define ED_DELIM_AFTER 28 -#define CB_COMPLETE 29 #define FL_NUMBER 30 #define LB_ALIGN 31 @@ -63,8 +47,6 @@ #define BT_OK 100 #define BT_CANCEL 101 #define BT_HELP 102 -#define BT_FORM 103 -#define BT_RESET 104 #define FL_FORM 105 #define LB_FORM 106 #define ED_FORM 107 diff --git a/sw/source/ui/misc/pggrid.hrc b/sw/source/ui/misc/pggrid.hrc index e736e5040dbb..9e700d10d315 100644 --- a/sw/source/ui/misc/pggrid.hrc +++ b/sw/source/ui/misc/pggrid.hrc @@ -33,12 +33,10 @@ #define FL_LAYOUT 6 #define FT_LINESPERPAGE 7 #define NF_LINESPERPAGE 8 -#define FT_LINESPERPAGEHINT 9 #define FT_TEXTSIZE 10 #define MF_TEXTSIZE 11 #define FT_CHARSPERLINE 12 #define NF_CHARSPERLINE 13 -#define FT_CHARSPERLINEHINT 14 #define FT_RUBYSIZE 15 #define MF_RUBYSIZE 16 #define CB_RUBYBELOW 17 diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/ui/ribbar/tblctrl.cxx index f004dc5dc2d2..99e4d6b892b3 100644 --- a/sw/source/ui/ribbar/tblctrl.cxx +++ b/sw/source/ui/ribbar/tblctrl.cxx @@ -34,8 +34,6 @@ #include "cmdid.h" #include "swtypes.hxx" #include "tblctrl.hxx" -#include "tblctrl.hrc" - SFX_IMPL_TOOLBOX_CONTROL( SwTableOptimizeCtrl, SfxUInt16Item ); diff --git a/sw/source/ui/ribbar/tblctrl.hrc b/sw/source/ui/ribbar/tblctrl.hrc deleted file mode 100644 index 7cfa32d7bb5d..000000000000 --- a/sw/source/ui/ribbar/tblctrl.hrc +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _TBLCTRL_HRC -#define _TBLCTRL_HRC -#include "ribbar.hrc" - -#define TBX_OPTIMIZE_TABLE 1 - -#endif - - diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc index 51ac45b2ae87..4b28eae5d011 100644 --- a/sw/source/ui/ribbar/workctrl.hrc +++ b/sw/source/ui/ribbar/workctrl.hrc @@ -29,9 +29,6 @@ #include "ribbar.hrc" #define TBX_INSERT 1 -#define TBX_OBJ_INSERT 2 -#define TBX_FIELD_INSERT 3 -#define TBX_NAVIGATION 4 #define IL_VALUES 5 #define IMG_BTN 6 #define ST_QUICK 7 diff --git a/sw/source/ui/smartmenu/stmenu.hrc b/sw/source/ui/smartmenu/stmenu.hrc index 56afc5752f79..20f33949f3cf 100644 --- a/sw/source/ui/smartmenu/stmenu.hrc +++ b/sw/source/ui/smartmenu/stmenu.hrc @@ -32,7 +32,6 @@ #define MN_SMARTTAG_POPUP (RC_SMARTTAG_BEGIN + 1) -#define MN_SMARTTAG 104 #define MN_SMARTTAG_OPTIONS 105 #define MN_ST_INSERT_START 500 diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc index 3933cd3fc37f..9665b0e48d41 100644 --- a/sw/source/ui/table/tabledlg.hrc +++ b/sw/source/ui/table/tabledlg.hrc @@ -45,18 +45,11 @@ #define ED_BOTTOM_DIST 23 #define FL_DIST 24 #define FT_WIDTH 25 -#define FT_SCOL 30 -#define DLB_SCOL 31 #define FT_POS 32 -#define DLB_SPOS 33 -#define FT_SSZ 34 -#define ED_SSZ 36 -#define FL_SHADE 37 #define CB_HEADLINE 40 #define FT_REPEAT_HEADER 40 #define NF_REPEAT_HEADER 40 #define WIN_REPEAT_HEADER 40 -#define FL_HEADLINE 41 #define FL_PROPERTIES 42 #define FT_TEXTORIENTATION 43 #define LB_TEXTORIENTATION 44 diff --git a/sw/source/ui/uiview/pview.hrc b/sw/source/ui/uiview/pview.hrc index 3724789431ed..de2e7a83b075 100644 --- a/sw/source/ui/uiview/pview.hrc +++ b/sw/source/ui/uiview/pview.hrc @@ -42,12 +42,9 @@ #define PVIEW_MAX_COL 20 //Dialog Druckoptionen -#define FL_ROWCOL 1 #define FT_ROWS 2 #define NF_ROWS 3 -#define FT_COLS 4 #define NF_COLS 5 -#define FL_MARGINS 6 #define FL_DISTANCE 7 #define FL_ORIENTATION 8 @@ -58,13 +55,9 @@ #define MF_LMARGIN 13 #define FT_RMARGIN 14 #define MF_RMARGIN 15 -#define FT_TMARGIN 16 #define MF_TMARGIN 17 -#define FT_BMARGIN 18 #define MF_BMARGIN 19 -#define FT_HMARGIN 20 #define MF_HMARGIN 21 -#define FT_VMARGIN 22 #define MF_VMARGIN 23 #define PB_STANDARD 24 diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc index bba57cf53d6b..58074783feb0 100644 --- a/sw/source/ui/utlui/navipi.hrc +++ b/sw/source/ui/utlui/navipi.hrc @@ -24,19 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TB_1 1 -#define TB_2 2 -#define TB_3 3 -#define TB_4 4 -#define BT_UP 5 -#define BT_DOWN 6 #define IL_CONTENT 7 #define FT_PAGE 10 #define ED_PAGE 11 -#define LB_SELECT 22 -#define TL_SELECT 23 -#define TB_PAGE_TEXT 41 -#define TB_PAGE_COUNT 42 #define TB_CONTENT 50 #define TL_CONTENT 51 #define LB_DOCS 53 diff --git a/sw/source/ui/wrtsh/wrtsh.hrc b/sw/source/ui/wrtsh/wrtsh.hrc index a82a4c3c1b48..1fb06902ba2a 100644 --- a/sw/source/ui/wrtsh/wrtsh.hrc +++ b/sw/source/ui/wrtsh/wrtsh.hrc @@ -29,7 +29,6 @@ #include "rcid.hrc" -#define DLG_GOTO (RC_WRTSH_BEGIN + 1) #define STR_DDEERROR_APP1 (RC_WRTSH_BEGIN + 2) diff --git a/toolkit/src2xml/src-sw.lst b/toolkit/src2xml/src-sw.lst index a0e7245fc4f4..9e8c875fdb1a 100644 --- a/toolkit/src2xml/src-sw.lst +++ b/toolkit/src2xml/src-sw.lst @@ -113,7 +113,6 @@ ../../sw/source/ui/ribbar/tbxanchr.src ../../sw/source/ui/ribbar/workctrl.src ../../sw/source/ui/ribbar/inputwin.src -../../sw/source/ui/ribbar/tblctrl.src ../../sw/source/ui/shells/shells.src ../../sw/source/ui/uiview/pview.src ../../sw/source/ui/uiview/view.src diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst index d0aad0119e49..1d7e3b28ecb5 100644 --- a/toolkit/src2xml/src.lst +++ b/toolkit/src2xml/src.lst @@ -226,7 +226,6 @@ ../../sw/source/ui/ribbar/tbxanchr.src ../../sw/source/ui/ribbar/workctrl.src ../../sw/source/ui/ribbar/inputwin.src -../../sw/source/ui/ribbar/tblctrl.src ../../sw/source/ui/shells/shells.src ../../sw/source/ui/uiview/pview.src ../../sw/source/ui/uiview/view.src diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 8e9d18eac258..d870eea636a0 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -39,12 +39,6 @@ #define RID_SAVE_PASSWORD (RID_UUI_START + 1) #define DLG_UUI_LOGIN (RID_UUI_START + 2) #define DLG_COOKIES (RID_UUI_START + 3) -#define STR_COOKIES_RECV_START (RID_UUI_START + 4) -#define STR_COOKIES_RECV_COOKIES (RID_UUI_START + 5) -#define STR_COOKIES_RECV_TITLE (RID_UUI_START + 6) -#define STR_COOKIES_SEND_START (RID_UUI_START + 7) -#define STR_COOKIES_SEND_COOKIES (RID_UUI_START + 8) -#define STR_COOKIES_SEND_TITLE (RID_UUI_START + 9) #define DLG_FILTER_SELECT (RID_UUI_START + 10) // RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM #define DLG_UUI_MASTERPASSWORD (RID_UUI_START + 12) @@ -60,9 +54,7 @@ #define STR_ERROR_PASSWORD_TO_OPEN_WRONG (RID_UUI_START + 24) #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG (RID_UUI_START + 25) #define DLG_UUI_UNKNOWNAUTH (RID_UUI_START + 26) -#define DLG_UUI_UNKNOWNAUTH_CRT (RID_UUI_START + 27) #define DLG_UUI_SSLWARN (RID_UUI_START + 28) -#define DLG_UUI_SSLWARN_CRT (RID_UUI_START + 29) #define RID_XMLSECDLG_MACROWARN (RID_UUI_START + 30) #define STR_UNKNOWNUSER (RID_UUI_START + 31) #define STR_OPENLOCKED_TITLE (RID_UUI_START + 32) diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 5eba31828f38..4aa148422d28 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -82,17 +82,12 @@ #define SV_PRINT_PAGE_BACKWARD 7 #define SV_PRINT_PAGE_EDIT 8 #define SV_PRINT_TABCTRL 9 -#define SV_PRINT_PRT_TYPE 10 -#define SV_PRINT_PRT_STATUS 11 -#define SV_PRINT_PRT_LOCATION 12 -#define SV_PRINT_PRT_COMMENT 13 #define SV_PRINT_TOFILE_TXT 14 #define SV_PRINT_DEFPRT_TXT 15 #define SV_PRINT_PRINTPREVIEW_TXT 16 #define SV_PRINT_TAB_NUP 1 #define SV_PRINT_PRT_NUP_LAYOUT_FL 1 -#define SV_PRINT_PRT_NUP_DEFAULT_BTN 2 #define SV_PRINT_PRT_NUP_BROCHURE_BTN 3 #define SV_PRINT_PRT_NUP_PAGES_BTN 4 #define SV_PRINT_PRT_NUP_PAGES_BOX 5 @@ -125,11 +120,6 @@ #define SV_PRINT_PRINTERS_FL 1 #define SV_PRINT_PRINTERS 2 #define SV_PRINT_PRT_SETUP 3 -#define SV_PRINT_RANGE 4 -#define SV_PRINT_ALL 5 -#define SV_PRINT_PAGERANGE 6 -#define SV_PRINT_SELECTION 7 -#define SV_PRINT_PAGERANGE_EDIT 8 #define SV_PRINT_COPIES 9 #define SV_PRINT_COPYCOUNT 10 #define SV_PRINT_COPYCOUNT_FIELD 11 @@ -193,7 +183,6 @@ #define SV_STDTEXT_PREFERENCES 10205 #define SV_MAC_SCREENNNAME 10206 #define SV_STDTEXT_ALLFILETYPES 10207 -#define SV_STDTEXT_LAST SV_STDTEXT_ALLFILETYPES #define STR_FPICKER_AUTO_EXTENSION 10300 #define STR_FPICKER_PASSWORD 10301 @@ -214,7 +203,6 @@ #define STR_FPICKER_SAVE 10316 #define STR_FPICKER_TYPE 10317 -#define SV_ACCESSERROR_FIRST SV_ACCESSERROR_WRONG_VERSION #define SV_ACCESSERROR_WRONG_VERSION 10500 #define SV_ACCESSERROR_BRIDGE_MSG 10501 #define SV_ACCESSERROR_OK_CANCEL_MSG 10502 @@ -226,7 +214,6 @@ #define SV_ACCESSERROR_JAVA_DISABLED 10508 #define SV_ACCESSERROR_TURNAROUND_MSG 10509 #define SV_ACCESSERROR_NO_FONTS 10510 -#define SV_ACCESSERROR_LAST SV_ACCESSERROR_NO_FONTS #define SV_SHORTCUT_HELP 10600 #define SV_SHORTCUT_CONTEXTHELP 10601 diff --git a/vcl/inc/vcl/fpicker.hrc b/vcl/inc/vcl/fpicker.hrc index 521610fac3e5..1432277d3460 100644 --- a/vcl/inc/vcl/fpicker.hrc +++ b/vcl/inc/vcl/fpicker.hrc @@ -46,7 +46,6 @@ #define STR_SVT_FOLDERPICKER_DEFAULT_TITLE (STR_SVT_FILEPICKER_START+12) #define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION (STR_SVT_FILEPICKER_START+13) #define STR_SVT_ALREADYEXISTOVERWRITE (STR_SVT_FILEPICKER_START+14) -#define STR_SVT_FILEPICKER_END (STR_SVT_ALREADYEXISTOVERWRITE) #endif diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc index e8f144577451..a187e515163a 100644 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ b/xmlsecurity/source/dialogs/dialogs.hrc @@ -95,22 +95,15 @@ #define DS_COL_2 (DS_COL_1+DS_BTNWIDTH_1) #define DS_COL_3 (DS_COL_2+DS_BTNSPACE_X) #define DS_COL_4 (DS_COL_3+DS_BTNWIDTH_1) -#define DS_COL_5 (DS_COL_4+DS_BTNSPACE_X) #define DS_COL_7 (DS_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define DS_COL_6 DS_COL_7 #define DS_ROW_0 RSC_SP_DLG_INNERBORDER_TOP -#define DS_ROW_1 (DS_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_X) -#define DS_ROW_7 DLGS_BOTTOM_BTN_L(DS_HEIGHT) -#define DS_ROW_6 DLGS_BOTTOM_BTN_Y(DS_HEIGHT) -#define DS_ROW_5 DLGS_BOTTOM_FL_Y(DS_HEIGHT) #define DS_ROW_4 DLGS_BOTTOM_LAST_CTRL_L(DS_HEIGHT) #define DS_ROW_3 (DS_ROW_4-RSC_CD_PUSHBUTTON_HEIGHT) #define DS_ROW_2A (DS_ROW_3-RSC_CD_FIXEDTEXT_HEIGHT-RSC_SP_CTRL_Y) #define DS_ROW_2 (DS_ROW_2A-RSC_SP_CTRL_GROUP_Y) -#define DS_LB_WIDTH (DS_COL_7-DS_COL_0) // --------- dialog Ceritficate chooser --------- #define FT_HINT_SELECT 1 @@ -184,7 +177,6 @@ #define CW_COL_4b (CW_COL_4a+DATE_WIDTH) #define CW_COL_4c (CW_COL_4b+3) #define CW_COL_4d (CW_COL_4c+8) -#define CW_COL_4e (CW_COL_4d+3) #define CW_ROW_0 (CV_ROW_0+RSC_SP_GRP_INNERBORDER_TOP) #define CW_ROW_1 (CW_ROW_0+RSC_SP_GRP_INNERBORDER_TOP) #define CW_ROW_2 (CW_ROW_0+IMG1_HEIGHT) @@ -197,7 +189,6 @@ #define CW_ROW_8 (CW_ROW_7+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT) #define CW_ROW_9 (CW_ROW_8+RSC_SP_CTRL_Y+RSC_CD_FIXEDTEXT_HEIGHT) #define CW_ROW_10 (CW_ROW_9+2) -#define CW_ROW_11 (CW_ROW_9+IMG2_HEIGHT) // --------- tab page Certificate viewer - Details --------- -- cgit v1.2.3