diff options
37 files changed, 67 insertions, 903 deletions
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index 0df1ee24d6c4..8cbbec6a4bc7 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -15,6 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _BASIDESH_HRC #define _BASIDESH_HRC @@ -29,10 +30,7 @@ #ifndef _SVX_NOIDERESIDS #define RID_BASICIDE_OBJECTBAR ( RID_BASICIDE_START + 0 ) -#define RID_BASICMENU ( RID_BASICIDE_START + 1 ) -#define RID_BASICPLUGINMENU ( RID_BASICIDE_START + 2 ) #define RID_EDT_WATCHEDIT ( RID_BASICIDE_START + 4 ) -#define RID_ICO_MDIWINDOW ( RID_BASICIDE_START + 5 ) #define RID_POPUP_BRKDLG ( RID_BASICIDE_START + 10 ) #define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 ) #define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 ) @@ -77,7 +75,6 @@ #define RID_STR_COMPILEERROR ( RID_BASICIDE_START + 23 ) #define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 ) #define RID_STR_STDMACRONAME ( RID_BASICIDE_START + 25 ) -#define RID_STR_STDJAVAFUNCTIONNAME ( RID_BASICIDE_START + 26 ) #define RID_STR_STDMODULENAME ( RID_BASICIDE_START + 27 ) #define RID_STR_ALL ( RID_BASICIDE_START + 28 ) #define RID_STR_CLOSE ( RID_BASICIDE_START + 29 ) @@ -104,7 +101,6 @@ #define RID_STR_FILEEXISTS ( RID_BASICIDE_START + 50 ) // free #define RID_STR_ERROROPENLIB ( RID_BASICIDE_START + 55 ) -#define RID_STR_STDJAVAMODULENAME ( RID_BASICIDE_START + 56 ) #define RID_STR_NEWLIB ( RID_BASICIDE_START + 57 ) #define RID_STR_NEWMOD ( RID_BASICIDE_START + 58 ) #define RID_STR_NEWDLG ( RID_BASICIDE_START + 59 ) @@ -163,7 +159,6 @@ #define RID_STR_NORMAL_MODULES ( RID_BASICIDE_START + 120 ) #define RID_STR_CLASS_MODULES ( RID_BASICIDE_START + 121 ) - #define RID_DLG_GOTOLINE ( RID_BASICIDE_START + 122 ) #define RID_FT_LINE ( RID_BASICIDE_START + 123 ) #define RID_ED_LINE ( RID_BASICIDE_START + 124 ) diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc index a61574dd044d..3864641be3a7 100644 --- a/basctl/source/basicide/moduldlg.hrc +++ b/basctl/source/basicide/moduldlg.hrc @@ -15,6 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _MODULDLG_HRC #define _MODULDLG_HRC @@ -35,7 +36,6 @@ #define RID_STR_BASICS 13 #define RID_PB_EXPORT 14 -#define RID_PB_EXPORT_PACKAGE 15 #define RID_TP_MOD 20 #define RID_TP_LIB 21 diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx index 366e8138a6a3..7ba9d112bebf 100644 --- a/basctl/source/basicide/tbxctl.cxx +++ b/basctl/source/basicide/tbxctl.cxx @@ -19,7 +19,7 @@ #define _BASIDE_POPUPWINDOWTBX -#include "tbxctl.hrc" +#include <svl/solar.hrc> #include <svx/svxids.hrc> #include "idetemp.hxx" diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc deleted file mode 100644 index 089ef429d48c..000000000000 --- a/basctl/source/basicide/tbxctl.hrc +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svl/solar.hrc> - -#define RID_TBXCONTROLS ( RID_BASICIDE_START + 65 ) -#define RID_TOOLBOX ( RID_BASICIDE_START + 66 ) diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc index 71a78ac64a0d..2d8bc26cb8ee 100644 --- a/basctl/source/inc/dlgresid.hrc +++ b/basctl/source/inc/dlgresid.hrc @@ -19,8 +19,6 @@ #ifndef _BASCTL_DLGRESID_HRC #define _BASCTL_DLGRESID_HRC -// include ----------------------------------------------------------- - #include <svl/solar.hrc> // Dialog Control Id's ----------------------------------------------------------- @@ -50,6 +48,7 @@ #define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 ) #define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 ) #define RID_STR_CLASS_SPINCONTROL ( RID_DLG_START + 24 ) + // Property Browser Headline Id's ----------------------------------------------------------- #define RID_STR_BRWTITLE_PROPERTIES ( RID_DLG_START + 60 ) @@ -61,7 +60,6 @@ #define RID_DLG_MANAGE_LANGUAGE ( RID_DLG_START + 70 ) #define RID_QRYBOX_LANGUAGE ( RID_DLG_START + 71 ) #define RID_DLG_SETDEF_LANGUAGE ( RID_DLG_START + 72 ) -#define RID_DLG_ADD_LANGUAGE ( RID_DLG_START + 73 ) // ----------------------------------------------------------------------- diff --git a/cui/source/dialogs/scriptdlg.hrc b/cui/source/dialogs/scriptdlg.hrc index 5568b447ab96..7ea7184da5fa 100644 --- a/cui/source/dialogs/scriptdlg.hrc +++ b/cui/source/dialogs/scriptdlg.hrc @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _SCRIPTDLG_HRC #define _SCRIPTDLG_HRC @@ -47,9 +48,6 @@ #define IMG_MACRO 5 #define IMG_DOCUMENT 7 -#define RID_IMGLST_OBJECTS ( RID_BASICIDE_START + 7 ) -#define RID_IMGLST_OBJECTS_HC (RID_BASICIDE_START + 13) - // NewObjectDialog #define FT_NEWLIB 10 #define STR_FT_NEWMACRO 11 diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 17ca8b58357d..a82ef940bb7b 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -24,11 +24,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _CUI_RESID_HRC #define _CUI_REDID_HRC -// include ------------------------------------------------------------------ - #include <sfx2/sfx.hrc> #include <sfx2/dialogs.hrc> @@ -36,7 +35,7 @@ // Gallery #define RID_CUI_GALLERY_START (RID_SVX_START + 360) -#define RID_CUI_GALLERY_END (RID_SVX_START + 410) +// RID_CUI_GALLERY_END (RID_SVX_START + 410) // tab pages // used in "dialogs" @@ -130,10 +129,8 @@ #define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 ) #define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116) #define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115) -#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) #define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//? #define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//? -#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118)//? // options #define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301) @@ -141,7 +138,6 @@ #define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298) #define OFA_TP_MEMORY (RID_OFA_START + 250) #define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) -#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160) #define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157) #define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155) #define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) @@ -212,7 +208,6 @@ #define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) #define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) #define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) -#define RID_SVXDLG_THES_LANGUAGE (RID_SVX_START + 38) #define RID_SVXSTR_HMERR_CHECKINSTALL (RID_SVX_START + 94) // hyperlink dialog @@ -321,7 +316,6 @@ #define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23) // customize - #define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291) #define RID_SVXPAGE_MENUS (RID_SVX_START + 292) #define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293) @@ -430,10 +424,6 @@ #define RID_SVXSTR_EVENT_CALCULATE (RID_SVX_START + 1193) #define RID_SVXSTR_EVENT_CONTENTCHANGED (RID_SVX_START + 1194) -#define RID_CUISTR_CONTROLS_CONTINUOUS (RID_SVX_START + 1195) -#define RID_CUISTR_CONTROLS_INVISIBLE (RID_SVX_START + 1196) -#define RID_CUISTR_CONTROLS_INSERTTABLE (RID_SVX_START + 1197) - #define RID_SVXDLG_CERTPATH (RID_SVX_START + 1198) #define RID_CUI_DIALOG_COLORPICKER (RID_SVX_START + 3) diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc index 72d5ee0b05a1..d07b88563691 100644 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ b/dbaccess/source/ui/app/dbu_app.hrc @@ -31,7 +31,6 @@ #define RID_STR_NEW_TABLE RID_STR_APP_START + 4 #define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 #define RID_STR_NEW_VIEW RID_STR_APP_START + 6 -#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7 #define RID_STR_NEW_QUERY RID_STR_APP_START + 8 #define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 #define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10 diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index d66bdf6f343a..41da16e62a42 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -107,7 +107,6 @@ #define DLG_COLLECTION_VIEW RID_DIALOG_START + 27 #define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 #define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 -#define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 #define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 #define DLG_TABLE_FILTER RID_DIALOG_START + 32 //======================================================================== @@ -126,7 +125,6 @@ #define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11 #define TAB_WIZ_COPYTABLE RID_PAGE_START + 12 // FREE -// free #define PAGE_LDAP RID_PAGE_START + 15 #define TAB_PAGE_USERADMIN RID_PAGE_START + 16 #define PAGE_MYSQL_ODBC RID_PAGE_START + 17 @@ -137,12 +135,9 @@ #define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 #define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 // FREE - // FREE #define PAGE_ORACLE_JDBC RID_PAGE_START + 27 #define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 // FREE - // FREE - // FREE #define PAGE_MOZILLA RID_PAGE_START + 32 #define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33 @@ -202,28 +197,6 @@ #define QUERY_USERADMIN_DELETE_USER RID_QUERYBOX_START + 12 #define TABLE_DESIGN_ALL_ROWS_DELETED RID_QUERYBOX_START + 13 - - - -//======================================================================== -// warning boxes - - -//======================================================================== -// toolboxes - -#define RID_BRW_TAB_TOOLBOX RID_TOOLBOX_START + 0 -#define RID_BRW_QRY_TOOLBOX RID_TOOLBOX_START + 1 -#define RID_QRY_TOOLBOX_SQL RID_TOOLBOX_START + 2 -#define RID_BRW_QUERYDESIGN_TOOLBOX RID_TOOLBOX_START + 3 -#define RID_BRW_REALTIONDESIGN_TOOLBOX RID_TOOLBOX_START + 4 -#define RID_BRW_APPLICATION_TOOLBOX RID_TOOLBOX_START + 5 - -//======================================================================== -// bitmaps - -// start with RID_BITMAP_START - //======================================================================== // images @@ -237,15 +210,10 @@ #define QUERY_TREE_ICON RID_IMAGE_START + 7 #define DATABASE_TREE_ICON RID_IMAGE_START + 8 // free -// free -// free #define IMG_PKEYICON RID_IMAGE_START + 12 // free -// free #define IMG_DATABASE_CONNECTED RID_IMAGE_START + 15 // free -// ... -// 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 @@ -256,7 +224,6 @@ #define FORM_TREE_ICON RID_IMAGE_START + 51 #define REPORT_TREE_ICON RID_IMAGE_START + 52 // free -// free #define FORMFOLDER_TREE_ICON RID_IMAGE_START + 55 @@ -264,17 +231,11 @@ // image lists #define IMG_JOINS RID_IMAGELIST_START + 0 #define IMG_INDEX_DLG_SC RID_IMAGELIST_START + 1 -// free #define IMG_INDEX_DLG_LC RID_IMAGELIST_START + 3 -// free #define IMP_FORM_SC RID_IMAGELIST_START + 5 -// free #define IMP_FORM_LC RID_IMAGELIST_START + 7 -// free #define IMP_REPORT_SC RID_IMAGELIST_START + 9 -// free #define IMP_REPORT_LC RID_IMAGELIST_START + 11 -// free //======================================================================== // menus @@ -287,12 +248,10 @@ #define RID_QUERYCOLPOPUPMENU RID_MENU_START + 5 #define RID_QUERYFUNCTION_POPUPMENU RID_MENU_START + 6 #define RID_TABLEDESIGNROWPOPUPMENU RID_MENU_START + 7 -#define RID_BRW_TABLEDESIGN_TOOLBOX RID_MENU_START + 8 #define RID_SBA_RTF_PKEYPOPUP RID_MENU_START + 9 #define RID_MENU_APP_EDIT RID_MENU_START + 10 #define RID_MENU_APP_NEW RID_MENU_START + 11 #define RID_MENU_APP_PREVIEW RID_MENU_START + 12 -#define RID_NEW_FORM RID_MENU_START + 13 #define MENU_BROWSER_DEFAULTCONTEXT RID_MENU_START + 14 #define RID_MENU_REFRESH_DATA RID_MENU_START + 15 #define RID_MENU_JOINVIEW_CONNECTION RID_MENU_START + 16 @@ -349,27 +308,18 @@ #define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38 // FREE #define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40 -#define RID_STR_EXTENSION_NAME RID_STR_GEN_START + 41 //======================================================================== // untyped resources -// free #define RSC_CHARSETS RID_UNTYPED_START + 2 -// free #define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 #define IMG_TABLESUBCRIPTION_SC RID_UNTYPED_START + 5 -// free #define IMG_TABLESUBCRIPTION_LC RID_UNTYPED_START + 7 -// free #define IMG_QUERYADMINISTRATION_SC RID_UNTYPED_START + 9 -// free #define IMG_QUERYADMINISTRATION_LC RID_UNTYPED_START + 11 -// free #define IMG_DOCUMENTLINKS_SC RID_UNTYPED_START + 13 -// free #define IMG_DOCUMENTLINKS_LC RID_UNTYPED_START + 15 -// free //======================================================================== // various diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc index 4bd6dbca30c2..b8a232fc1c4e 100644 --- a/desktop/inc/deployment.hrc +++ b/desktop/inc/deployment.hrc @@ -34,7 +34,7 @@ #define RID_DEPLOYMENT_START 2000 #define RID_DEPLOYMENT_GUI_START RID_DEPLOYMENT_START -#define RID_DEPLOYMENT_MISC_START (RID_DEPLOYMENT_START+500) +// RID_DEPLOYMENT_MISC_START (RID_DEPLOYMENT_START+500) #define RID_DEPLOYMENT_MANAGER_START (RID_DEPLOYMENT_START+1000) #define RID_DEPLOYMENT_REGISTRY_START (RID_DEPLOYMENT_START+1500) diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 9c68d7b9fd2d..d08f87911c7a 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -33,7 +33,7 @@ #endif #define RID_DESKTOP_DIALOG_START 2000 -#define RID_FIRSTSTSTART_START 3000 +// RID_FIRSTSTSTART_START 3000 #define RID_DESKTOP_STRING_START 10000 diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 744cd210a56f..ba03872ff8c8 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -39,7 +39,6 @@ #define RID_EM_BTN_HELP 11 #define RID_EM_BTN_ADD 12 #define RID_EM_BTN_CHECK_UPDATES 13 -#define RID_EM_BTN_OPTIONS 14 #define RID_EM_BTN_CANCEL 15 #define RID_EM_FT_TYPE_EXTENSIONS 16 #define RID_EM_CBX_BUNDLED 17 @@ -120,24 +119,18 @@ #define RID_DLG_UPDATE_NOINSTALL 20 #define RID_DLG_UPDATE_NODEPENDENCY 21 #define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER 22 -#define RID_DLG_UPDATE_NOPERMISSION 23 -#define RID_DLG_UPDATE_NOPERMISSION_VISTA 24 #define RID_DLG_UPDATE_BROWSERBASED 25 #define RID_DLG_UPDATE_PUBLISHER_LABEL 26 #define RID_DLG_UPDATE_PUBLISHER_LINK 27 #define RID_DLG_UPDATE_RELEASENOTES_LABEL 28 #define RID_DLG_UPDATE_RELEASENOTES_LINK 29 -#define RID_DLG_UPDATE_NOUPDATE 30 #define RID_DLG_UPDATE_VERSION 31 #define RID_DLG_UPDATE_IGNORE 32 #define RID_DLG_UPDATE_ENABLE 33 #define RID_DLG_UPDATE_IGNORE_ALL 34 #define RID_DLG_UPDATE_IGNORED_UPDATE 35 - - #define RID_DLG_UPDATEINSTALL (RID_DEPLOYMENT_GUI_START + 20) -#define RID_INFOBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START + 21) #define RID_IMG_WARNING (RID_DEPLOYMENT_GUI_START+56) #define RID_IMG_LOCKED (RID_DEPLOYMENT_GUI_START+58) @@ -180,6 +173,4 @@ #define RID_DLG_LICENSE RID_DEPLOYMENT_LICENSE_START - - #endif diff --git a/editeng/inc/editeng/editrids.hrc b/editeng/inc/editeng/editrids.hrc index a77b87bfac91..4b6e63c7ee2a 100644 --- a/editeng/inc/editeng/editrids.hrc +++ b/editeng/inc/editeng/editrids.hrc @@ -50,7 +50,7 @@ #define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_EDIT_START + 11) #define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_EDIT_START + 12) #define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDIT_START + 13) -#define RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14) +// RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14) #define RID_SVXITEMS_TRUE (RID_EDIT_START + 15) #define RID_SVXITEMS_FALSE (RID_EDIT_START + 16) @@ -128,7 +128,7 @@ #define RID_SVXITEMS_RELIEF_NONE (RID_EDIT_START + 85) #define RID_SVXITEMS_RELIEF_EMBOSSED (RID_EDIT_START + 86) #define RID_SVXITEMS_RELIEF_ENGRAVED (RID_EDIT_START + 87) -#define RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88) +// RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88) // HM_ERR #define RID_SVXSTR_HMERR_THESAURUS (RID_EDIT_START + 89) @@ -174,7 +174,6 @@ #define RID_SVXITEMS_STRIKEOUT_NONE (RID_EDIT_START + 113) #define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_EDIT_START + 114) #define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_EDIT_START + 115) -#define RID_SVXITEMS_STRIKEOUT_DONTKNOW (RID_EDIT_START + 116) #define RID_SVXITEMS_STRIKEOUT_BOLD (RID_EDIT_START + 117) #define RID_SVXITEMS_STRIKEOUT_SLASH (RID_EDIT_START + 118) #define RID_SVXITEMS_STRIKEOUT_X (RID_EDIT_START + 119) @@ -238,7 +237,6 @@ #define RID_SVXITEMS_WEIGHT_BLACK (RID_EDIT_START + 168) // enum FontItalic ------------------------------------------------------- -#define RID_SVXITEMS_ITALIC_BEGIN (RID_EDIT_START + 206) #define RID_SVXITEMS_ITALIC_NONE (RID_EDIT_START + 206) #define RID_SVXITEMS_ITALIC_OBLIQUE (RID_EDIT_START + 207) #define RID_SVXITEMS_ITALIC_NORMAL (RID_EDIT_START + 208) diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index 9ca5f3da793d..e37e72b4d02d 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -33,8 +33,6 @@ #define RID_BIB_START RID_EXTENSIONS_START #endif -// ResIDs - //Dialogs (100) #define RID_BIB_DIALOG (RID_BIB_START) #define RID_TP_GENERAL (RID_BIB_DIALOG) @@ -50,19 +48,6 @@ //Menu(100) #define RID_BIB_MENU (RID_BIB_CONTROLS + 100) -#define RID_MAIN_MENU (RID_BIB_MENU +1) -//#define RID_MAIN_ME_HIERARCHICAL (RID_BIB_MENU +2) -#define RID_MAIN_ME_NEWENTRY (RID_BIB_MENU +3) -#define RID_MAIN_ME_CHANGEENTRY (RID_BIB_MENU +4) -#define RID_MAIN_ME_REMOVEENTRY (RID_BIB_MENU +5) -#define RID_MAIN_ME_SEARCH (RID_BIB_MENU +6) -#define RID_MAIN_ME_FIELDDLG (RID_BIB_MENU +7) -//#define RID_MAIN_ME_LAYOUT (RID_BIB_MENU +8) -#define RID_MAIN_ME_MAPPING (RID_BIB_MENU +9) -#define RID_MAIN_ME_DBSOURCE (RID_BIB_MENU +10) -#define RID_MAIN_DELETE_RECORD (RID_BIB_MENU +11) -#define RID_MAIN_INSERT_RECORD (RID_BIB_MENU +12) - #define RID_POPUP_ME_VIEW (RID_BIB_MENU +50) // Strings (500) diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index a3238220ddc7..a0cfd38bc3aa 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -146,18 +146,10 @@ #define RID_STR_HELPURL ( RID_FORMBROWSER_START + 118 ) #define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 ) #define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 ) -#define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 ) #define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 ) #define RID_STR_WHEEL_BEHAVIOR ( RID_FORMBROWSER_START + 123 ) #define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 124 ) // FREE - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE -#define RID_STR_ENUM_NAVIGATION ( RID_FORMBROWSER_START + 131 ) #define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 ) #define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 ) #define RID_STR_EVT_CHANGED ( RID_FORMBROWSER_START + 134 ) @@ -214,7 +206,6 @@ #define RID_STR_TIME ( RID_FORMBROWSER_START + 185 ) #define RID_STR_SCALEIMAGE ( RID_FORMBROWSER_START + 186 ) #define RID_STR_PUSHBUTTONTYPE ( RID_FORMBROWSER_START + 187 ) -#define RID_STR_ENUM_PUSHBUTTONTYPE ( RID_FORMBROWSER_START + 188 ) #define RID_STR_UNABLETOCONNECT ( RID_FORMBROWSER_START + 189 ) #define RID_STR_TEXT ( RID_FORMBROWSER_START + 190 ) #define RID_STR_BOUND_CELL ( RID_FORMBROWSER_START + 191 ) @@ -232,7 +223,6 @@ #define RID_STR_DEFAULTTIME ( RID_FORMBROWSER_START + 203 ) #define RID_STR_WORDBREAK ( RID_FORMBROWSER_START + 204 ) #define RID_STR_SHOW_SCROLLBARS ( RID_FORMBROWSER_START + 205 ) -#define RID_STR_QUERYDESIGN_TITLE ( RID_FORMBROWSER_START + 206 ) #define RID_STR_ICONSIZE ( RID_FORMBROWSER_START + 207 ) #define RID_STR_WRITING_MODE ( RID_FORMBROWSER_START + 208 ) #define RID_STR_SHOW_POSITION ( RID_FORMBROWSER_START + 209 ) diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc index 2bbf94ed50c7..8c50b5ad87b3 100644 --- a/filter/inc/filter.hrc +++ b/filter/inc/filter.hrc @@ -35,10 +35,9 @@ // Help-Ids -------------------------------------------------------------- #define RID_PDF_DIALOG_START (RID_FILTER_START + 0) -#define RID_PDF_DIALOG_END (RID_FILTER_START + 19) +// RID_PDF_DIALOG_END (RID_FILTER_START + 19) #define RID_XSLT_DIALOG_START (RID_FILTER_START + 20) -#define RID_XSLT_DIALOG_END (RID_FILTER_START + 69) -#define RID_PDF_OLD_EXPORT_DLG (RID_FILTER_START + 70) +// RID_XSLT_DIALOG_END (RID_FILTER_START + 69) #define DLG_EXPORT_EPCT (RID_GOODIES_START+ 0) #define DLG_EXPORT_GIF (RID_GOODIES_START+ 1) diff --git a/framework/inc/services/logindialog.hrc b/framework/inc/services/logindialog.hrc index 0d845d273fd8..b19e6bc6f888 100644 --- a/framework/inc/services/logindialog.hrc +++ b/framework/inc/services/logindialog.hrc @@ -24,29 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -// windows / dialogs -#define RID_DLG_LOGIN 1000 // controls -#define RID_FI_HEADER 1 -#define RID_FT_LOGINTEXT 2 -#define RID_FT_USERNAME 3 -#define RID_FT_PASSWORD 4 -#define RID_FT_SERVER 5 -#define RID_ED_USERNAME 6 -#define RID_ED_PASSWORD 7 -#define RID_FL_SERVER 8 -#define RID_CB_SERVER 9 -#define RID_FL_PROXYSETTINGS 10 -#define RID_RB_NOPROXY 11 -#define RID_RB_USEBROWSERPROXY 12 -#define RID_RB_USECUSTOMPROXY 13 -#define RID_FT_SECURITYPROXY 15 -#define RID_FT_SECURITYPROXYHOST 16 -#define RID_ED_SECURITYPROXYHOST 17 -#define RID_FT_SECURITYPROXYPORT 18 -#define RID_ED_SECURITYPROXYPORT 19 -#define RID_FL_BUTTONS 20 #define RID_PB_OK 21 #define RID_PB_CANCEL 22 -#define RID_PB_ADDITIONALSETTINGS 23 diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc index 439cab7315a7..7cd1d7754830 100644 --- a/padmin/source/padialog.hrc +++ b/padmin/source/padialog.hrc @@ -76,48 +76,23 @@ #define RID_PA_TXT_TESTPAGE_PRINTED 1005 #define RID_ERR_PRINTERNOTREMOVEABLE 1006 -#define RID_ERR_COMMANDCONNECTED 1007 -#define RID_ERR_FILENOTFOUND 1008 #define RID_ERR_NOWRITE 1009 #define RID_ERR_NOPRINTER 1013 -#define RID_ERR_FILEOPENREAD 1016 -#define RID_ERR_FILEOPENWRITE 1017 #define RID_QRY_PRTNAME 1022 -#define RID_METRICOPTIONS_DLG 1029 -#define RID_METDLG_BTN_OK 1 -#define RID_METDLG_BTN_CANCEL 2 -#define RID_METDLG_BTN_SELECTION 3 -#define RID_METDLG_BTN_ALL 4 -#define RID_METDLG_BTN_CORRECT 5 - -#define RID_TXT_REFETCH 1031 - #define RID_BXT_TESTPAGE 1034 #define RID_BXT_ENVIRONMENT 1035 #define RID_YOU_SURE 1040 - #define RID_ERR_REMOVEDRIVERFAILED 1041 - #define RID_BUTTERFLY 1047 - -#define RID_COMMAND_TXT_MODIFY 1049 -#define RID_COMMAND_TXT_ADDENTRY 1050 #define RID_ERR_REMOVESGENPRT 1051 -#define RID_PA_TXT_NOWRITE 1052 - - -#define RID_TESTPAGESAVE 1055 - #define RID_QUERY_REMOVEDRIVER 1058 #define RID_QUERY_REMOVEPRINTER 1059 #define RID_QUERY_DRIVERUSED 1062 #define RID_ERR_REMOVEDEFAULTDRIVER 1063 -#define RID_TXT_IMPORTTITLE 1066 - #define RID_TXT_TESTPAGE_MODEL 1068 #define RID_TXT_TESTPAGE_QUEUE 1069 #define RID_TXT_TESTPAGE_DATE 1070 diff --git a/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc index 7b6677de7ec4..d6c2a21a220a 100644 --- a/padmin/source/rtsetup.hrc +++ b/padmin/source/rtsetup.hrc @@ -59,7 +59,6 @@ #define RID_RTS_DEVICE_SPACE_BOX 10 #define RID_RTS_DEVICE_DEPTH_TXT 11 #define RID_RTS_DEVICE_DEPTH_BOX 12 -#define RID_RTS_DEVICE_COMPRESS_BOX 13 #define RID_RTS_PAPERPAGE 4004 #define RID_RTS_PAPER_PAPER_TXT 1 diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 013cafdd8b3e..48b868dbe36c 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -170,7 +170,6 @@ #define RID_STR_STARTNEWPAGE (RID_STRING_START + 98) #define RID_STR_RESETPAGENUMBER (RID_STRING_START + 99) #define RID_STR_COLUMNHEADERFOOTER_DELETE (RID_STRING_START + 100) -#define RID_STR_MINHEIGHTNEWPAGE (RID_STRING_START + 101) #define RID_STR_PRINTWHENGROUPCHANGE (RID_STRING_START + 102) #define RID_STR_REPORTHEADERFOOTER_INSERT (RID_STRING_START + 103) #define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) @@ -244,7 +243,6 @@ #define RID_PAGE_BACKGROUND ( RID_PAGE_START + 7 ) #define RID_PAGE_TWOLN ( RID_PAGE_START + 8 ) #define RID_PAGEDIALOG_LINE ( RID_PAGE_START + 9 ) -#define RID_PAGE_LINE ( RID_PAGE_START + 10 ) #define RID_PAGE_ALIGNMENT ( RID_PAGE_START + 11 ) // ----------------------------------------------------------------------- diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index e2949d44fd96..6142f10a6653 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -42,8 +42,6 @@ #define VAR_ARGS 30 // variable Parameter in scfuncs.src -#define RID_HANDLEBITMAP 10005 - // areas #define SC_VIEW_START (SID_SC_START) @@ -93,9 +91,7 @@ #define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +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) @@ -121,7 +117,6 @@ #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) @@ -130,21 +125,18 @@ #define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) // protection-page // other slot-IDs: - #define SID_SCUSERLISTS (SC_VIEW_START + 37) // user defined lists #define RES_TBX_DUMMY (SC_VIEW_START + 38) // dummy-item #define SID_SCVIEWOPTIONS (SC_VIEW_START + 39) #define SID_SCDOCOPTIONS (SC_VIEW_START + 40) // cursor movements as properties: - #define SID_CURRENTCELL (SC_VIEW_START + 41) #define SID_CURRENTTAB (SC_VIEW_START + 42) #define SID_CURRENTDOC (SC_VIEW_START + 43) #define SID_CURRENTOBJECT (SC_VIEW_START + 44) // slot-IDs for special toolbox functions: - #define SID_NUMBER_CURRENCY (SC_VIEW_START + 45) #define SID_NUMBER_PERCENT (SC_VIEW_START + 46) @@ -735,7 +727,6 @@ #define RID_OBJECTBAR_APP (SC_RESOURCE_START) #define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) -#define RID_OBJECTBAR_INPUT (SC_RESOURCE_START+2) #define RID_POPUP_CELLS (SC_RESOURCE_START+3) #define RID_POPUP_DRAW (SC_RESOURCE_START+4) #define RID_TEXT_TOOLBOX (SC_RESOURCE_START+5) @@ -748,9 +739,7 @@ #define RID_CNTRLR_WIN (SC_RESOURCE_START+14) #define RID_GLOBSTR (SC_RESOURCE_START+15) #define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19) -#define RID_SCFUNCTIONS (SC_RESOURCE_START+20) #define RID_POPUP_PIVOT (SC_RESOURCE_START+21) -#define RID_IMGLIST_INPUTWIN (SC_RESOURCE_START+22) #define RID_ERRHDLSC (SC_RESOURCE_START+23) #define RID_POPUP_GRAPHIC (SC_RESOURCE_START+24) #define RID_POPUP_DRAWTEXT (SC_RESOURCE_START+29) @@ -760,16 +749,11 @@ #define RID_POPUP_EDIT (SC_RESOURCE_START+33) #define RID_POPUP_AUDIT (SC_RESOURCE_START+34) #define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35) -#define RID_TBXCTL_INSERT (SC_RESOURCE_START+38) -#define RID_TBXCTL_INSCELLS (SC_RESOURCE_START+39) -#define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) #define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) #define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) #define RID_POPUP_CONTROL (SC_RESOURCE_START+45) #define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) #define RID_POPUP_DRAWFORM (SC_RESOURCE_START+48) -#define RID_SC_ADDIN_ROT13 (SC_RESOURCE_START+50) -#define RID_SC_ADDIN_DFA (SC_RESOURCE_START+51) #define RID_IMAGELIST_NAVCONT (SC_RESOURCE_START+52) #define RID_DRAW_OBJECTBAR (SC_RESOURCE_START+53) #define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54) @@ -1037,28 +1021,16 @@ #define RID_IMG_SELECT_CURRENT (BMP_START + 8) #define RID_IMG_UNSELECT_CURRENT (BMP_START + 9) -#define RID_SCPTR_PIVOTCOL (BMP_START + 81) -#define RID_SCPTR_PIVOTROW (BMP_START + 82) -#define RID_SCPTR_DETECTIVE (BMP_START + 83) -#define RID_SCPTR_CHART (BMP_START + 84) - -#define RID_SCICN_DOCUMENT (BMP_START + 95) -#define RID_SCICN_TEMPLATE (BMP_START + 96) -#define RID_SCICN_SC10DOC (BMP_START + 97) - #define BMP_END (BMP_START + 100) #define SC_DIALOGS_START (BMP_END) #define RID_SCDLG_ATTR (SC_DIALOGS_START) -#define RID_SCPAGE_NUMBER (SC_DIALOGS_START + 1) -#define RID_SCPAGE_ALIGNMENT (SC_DIALOGS_START + 2) #define RID_SCPAGE_PROTECTION (SC_DIALOGS_START + 3) #define RID_SCDLG_SORT (SC_DIALOGS_START + 5) #define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6) #define RID_SCPAGE_SORT_OPTIONS (SC_DIALOGS_START + 7) #define RID_SCDLG_FILTER (SC_DIALOGS_START + 8) #define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9) -#define RID_SCMISCDLGS (SC_DIALOGS_START + 10) #define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11) #define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) #define RID_SCDLG_DELCONT (SC_DIALOGS_START + 13) @@ -1072,39 +1044,27 @@ #define RID_SCDLG_GROUP (SC_DIALOGS_START + 21) #define RID_SCDLG_NAMES (SC_DIALOGS_START + 22) #define RID_SCDLG_DBNAMES (SC_DIALOGS_START + 23) -#define RID_SCDLG_PRINTOPTIONS (SC_DIALOGS_START + 24) -#define RID_SCPAGE_PRINTOPTIONS (SC_DIALOGS_START + 25) #define RID_SCDLG_SOLVER (SC_DIALOGS_START + 26) #define RID_SCDLG_SUBTOTALS (SC_DIALOGS_START + 27) #define RID_SUBTBASE (SC_DIALOGS_START + 28) #define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29) -#define RID_SCDLG_OPTIONS (SC_DIALOGS_START + 30) #define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31) #define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33) #define RID_SCDLG_PIVOT_LAYOUT (SC_DIALOGS_START + 34) #define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35) -#define RID_SCTBXWND_SCENARIO (SC_DIALOGS_START + 36) -#define RID_SCDLG_FORMULATOR (SC_DIALOGS_START + 37) #define RID_SCDLG_PIVOTSUBT (SC_DIALOGS_START + 38) #define RID_SCDLG_NEWSCENARIO (SC_DIALOGS_START + 39) -#define RID_SCDLG_FORMULA (SC_DIALOGS_START + 40) -#define RID_SCDLG_ARGUMENTS (SC_DIALOGS_START + 41) #define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42) #define RID_SCPAGE_TABLE (SC_DIALOGS_START + 43) #define RID_SCPAGE_AREAS (SC_DIALOGS_START + 44) -#define RID_SCDLG_STYLES_START (SC_DIALOGS_START + 45) -#define RID_SCDLG_STYLES_CHAR (SC_DIALOGS_START + 45) #define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46) -#define RID_SCDLG_STYLES_FRAME (SC_DIALOGS_START + 47) #define RID_SCDLG_STYLES_PAGE (SC_DIALOGS_START + 48) -#define RID_SCDLG_STYLES_END (SC_DIALOGS_START + 48) #define RID_HFBASE (SC_DIALOGS_START + 49) #define RID_SCDLG_HFEDIT (SC_DIALOGS_START + 50) #define RID_SCDLG_HFEDIT_ALL (SC_DIALOGS_START + 51) #define RID_SCDLG_HFED_HEADER (SC_DIALOGS_START + 52) #define RID_SCDLG_HFED_FOOTER (SC_DIALOGS_START + 53) #define RID_SCBTN_HFEDIT (SC_DIALOGS_START + 54) -#define RID_SCPAGE_VIEW (SC_DIALOGS_START + 55) #define RID_SCPAGE_CALC (SC_DIALOGS_START + 56) #define RID_SCDLG_NAVIGATOR (SC_DIALOGS_START + 57) #define RID_SCDLG_TABOP (SC_DIALOGS_START + 58) @@ -1123,7 +1083,6 @@ #define RID_SCDLG_COLORROW (SC_DIALOGS_START + 71) #define RID_SCDLG_NAMES_PASTE (SC_DIALOGS_START + 72) #define RID_SCDLG_NAMES_CREATE (SC_DIALOGS_START + 73) -#define RID_SCDLG_NAMES_APPLY (SC_DIALOGS_START + 74) //NYI #define RID_SCDLG_NAMES_DEFINE (SC_DIALOGS_START + 75) #define RID_SCDLG_CHAR (SC_DIALOGS_START + 76) @@ -1133,18 +1092,7 @@ #define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80) #define RID_SCDLG_AREAS (SC_DIALOGS_START + 81) -#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82) - // popup for statusbar controller -#define RID_POPUP_SUMCTL (SC_DIALOGS_START + 83) -#define RID_SUMCTL_SUM (SC_DIALOGS_START + 84) -#define RID_SUMCTL_MIN (SC_DIALOGS_START + 85) -#define RID_SUMCTL_MAX (SC_DIALOGS_START + 86) -#define RID_SUMCTL_COUNT (SC_DIALOGS_START + 87) -#define RID_SUMCTL_COUNT2 (SC_DIALOGS_START + 88) -#define RID_SUMCTL_AVG (SC_DIALOGS_START + 89) -#define RID_SUMCTL_NONE (SC_DIALOGS_START + 90) - #define RID_SCDLG_ASCII (SC_DIALOGS_START + 91) // popup for drop-mode in navigator @@ -1181,11 +1129,8 @@ #define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113) #define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114) -#define RID_SCPAGE_INPUT (SC_DIALOGS_START + 115) #define RID_SCTAB_PARAMETER (SC_DIALOGS_START + 116) -#define RID_SCTAB_FUNCTION (SC_DIALOGS_START + 117) -#define RID_SCTAB_STRUCT (SC_DIALOGS_START + 118) #define RID_SCDLG_CHANGES (SC_DIALOGS_START + 119) @@ -1199,7 +1144,6 @@ #define RID_SCDLG_SIMPLEREF (SC_DIALOGS_START + 125) #define WID_SIMPLE_REF (SC_DIALOGS_START + 126) #define RID_POPUP_CHANGES (SC_DIALOGS_START + 127) -#define RID_SCPAGE_OPTLOAD (SC_DIALOGS_START + 128) #define RID_SCDLG_DAPITYPE (SC_DIALOGS_START + 129) #define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) @@ -1223,7 +1167,6 @@ #define RID_SCDLG_SHAREDOCUMENT (SC_DIALOGS_START + 146) #define RID_SCDLG_SORT_WARNING (SC_DIALOGS_START + 147) #define RID_SCDLG_TABPROTECTION (SC_DIALOGS_START + 148) -#define RID_SCDLG_DOCPROTECTION (SC_DIALOGS_START + 149) #define RID_SCDLG_RETYPEPASS (SC_DIALOGS_START + 150) #define RID_SCDLG_RETYPEPASS_INPUT (SC_DIALOGS_START + 151) #define RID_SCDLG_TEXT_IMPORT_OPTIONS (SC_DIALOGS_START + 152) @@ -1232,8 +1175,6 @@ #define RID_SCDLG_DATABAR (SC_DIALOGS_START + 155) #define RID_COND_ENTRY (SC_DIALOGS_START + 156) #define RID_SCDLG_FORMULA_CALCOPTIONS (SC_DIALOGS_START + 157) -#define RID_SCPAGE_SORTKEY_FIELDS (SC_DIALOGS_START + 158) -#define RID_SCDLG_SORTKEY (SC_DIALOGS_START + 159) #define SC_DIALOGS_END (SC_DIALOGS_START + 160) diff --git a/sc/source/ui/inc/tbinsert.hrc b/sc/source/ui/inc/tbinsert.hrc index 78ff1ca0ec84..20e542d90bc7 100644 --- a/sc/source/ui/inc/tbinsert.hrc +++ b/sc/source/ui/inc/tbinsert.hrc @@ -25,6 +25,3 @@ * ************************************************************************/ -#define RID_TOOLBOX_INSERT 1 -#define RID_TOOLBOX_INSCELLS 2 -#define RID_TOOLBOX_INSOBJ 3 diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 4de2609a8eed..72ded387b3d4 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -140,9 +140,9 @@ #define STR_TOOL_PANEL_SHELL RID_GLOB_START+116 #define RID_CUSTOMANIMATION_START RID_GLOB_START+120 -#define RID_CUSTOMANIMATION_END RID_GLOB_START+199 +// RID_CUSTOMANIMATION_END RID_GLOB_START+199 #define RID_ANNOTATIONS_START RID_GLOB_START+200 -#define RID_ANNOTATIONS_END RID_GLOB_START+220 +// RID_ANNOTATIONS_END RID_GLOB_START+220 #define STR_UNDO_ANIMATION RID_GLOB_START+221 #define STR_UNDO_SLIDE_PARAMS RID_GLOB_START+222 #define RID_SLIDESHOW_CONTEXTMENU RID_GLOB_START+223 diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index e09af8141332..462b00fb5e79 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -24,11 +24,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _SFX_HRC #define _SFX_HRC -// include --------------------------------------------------------------- - #ifndef _SOLAR_HRC #include <svl/solar.hrc> #endif @@ -120,21 +119,20 @@ #define RID_SFX_APP_START (RID_SFX_START + 256) #define RID_SFX_MENU_START (RID_SFX_START + 768) -#define RID_SFX_CONFIG_START (RID_SFX_START + 1536) +// RID_SFX_CONFIG_START (RID_SFX_START + 1536) #define RID_SFX_DOC_START (RID_SFX_START + 1792) #define RID_SFX_DIALOG_START (RID_SFX_START + 2048) #define RID_SFX_BASTYP_START (RID_SFX_START + 2304) #define RID_SFX_EXPLORER_START (RID_SFX_START + 2816) -#define RID_CNT_START (RID_SFX_START + 3072) +// RID_CNT_START (RID_SFX_START + 3072) #define RID_SFX_SFXLOCAL_START (RID_SFX_START + 3082) #define RID_SFX_VIEW_START (RID_SFX_START + 4096) -#define RID_SFX_NODES_START (RID_SFX_START + 4500) -#define RID_CNT_START2 (RID_SFX_NODES_START) -#define RID_SFX_CHAOSDOC_START (RID_SFX_START + 5120) -#define RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800) -#define RID_SFX_HELPCOMPONENT_START (RID_SFX_START + 7000) +// RID_CNT_START2 (RID_SFX_START + 4500) +// RID_SFX_CHAOSDOC_START (RID_SFX_START + 5120) +// RID_SFX_TPLCOMPONENT_START (RID_SFX_START + 6800) +// RID_SFX_HELPCOMPONENT_START (RID_SFX_START + 7000) //-------------------------------------------------------------------- @@ -175,31 +173,9 @@ #define MSG_QUERY_LASTVERSION RID_SFX_START -#define RID_APPFONT RID_SFX_START #define RID_APPLICATION RID_SFX_START -#define RID_APPWINDOWICON RID_SFX_START #define RID_DEFAULTIMAGELIST_SC (RID_SFX_START+15) -#define RID_DEFAULTIMAGELIST_SM (RID_SFX_START+16) #define RID_DEFAULTIMAGELIST_LC (RID_SFX_START+17) -#define RID_DEFAULTIMAGELIST_LM (RID_SFX_START+18) -#define RID_STYLEDLG (RID_SFX_START+28) -#define RID_DEFAULTIMAGELIST_SMH (RID_SFX_START+36) -#define RID_DEFAULTIMAGELIST_LMH (RID_SFX_START+38) -#define RID_IMAGELIST_SCH (RID_SFX_START+39) -#define RID_IMAGELIST_SMH (RID_SFX_START+40) -#define RID_IMAGELIST_LCH (RID_SFX_START+41) -#define RID_IMAGELIST_LMH (RID_SFX_START+42) -#define RID_APPIMAGELIST_SCH (RID_SFX_START+43) -#define RID_APPIMAGELIST_SMH (RID_SFX_START+44) -#define RID_APPIMAGELIST_LCH (RID_SFX_START+45) -#define RID_APPIMAGELIST_LMH (RID_SFX_START+46) -#define RID_OFFICEIMAGELIST_SCH (RID_SFX_START+47) -#define RID_OFFICEIMAGELIST_SMH (RID_SFX_START+48) -#define RID_OFFICEIMAGELIST_LCH (RID_SFX_START+49) -#define RID_OFFICEIMAGELIST_LMH (RID_SFX_START+50) -#define RID_DEFAULTINTRO (RID_SFX_START+0) -#define RID_DEFAULTINTRO_ADABAS (RID_SFX_START+1) -#define RID_DEFAULTINTRO_PORTAL (RID_SFX_START+2) #define RID_STYLECATALOG (RID_SFX_START+1201) @@ -297,20 +273,15 @@ #define GID_APP GID_APPLICATION #define GID_HELP GID_APPLICATION -// ------------------------------------------------------------------------ - -#define RID_SFX_GLOBALS 1000 - // ========================================================================= #define RID_OPTIONS_START (SID_LIB_START + 2000) -#define RID_OPTIONS_END (RID_OPTIONS_START + 100) +// RID_OPTIONS_END (RID_OPTIONS_START + 100) // ResId's ------------------------------------------------------------------ #define RID_SFXPAGE_SAVE (RID_OPTIONS_START + 0) #define RID_SFXPAGE_GENERAL (RID_OPTIONS_START + 1) -#define RID_SFXPAGE_SPELL (RID_OPTIONS_START + 2) #define RID_SFXDLG_NEWDICT (RID_OPTIONS_START + 3) #define RID_SFXDLG_EDITDICT (RID_OPTIONS_START + 4) #define RID_SFXQB_DELDICT (RID_OPTIONS_START + 5) diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc index 33b57a2341b4..836a5824402f 100644 --- a/sfx2/source/appl/app.hrc +++ b/sfx2/source/appl/app.hrc @@ -39,7 +39,6 @@ #define STR_ISMODIFIED (RID_SFX_APP_START+11) #define RID_FULLSCREENTOOLBOX (RID_SFX_APP_START+42) -#define RID_RECORDINGTOOLBOX (RID_SFX_APP_START+43) #define RID_ENVTOOLBOX (RID_SFX_APP_START+44) #define STR_QUITAPP (RID_SFX_APP_START+59) diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 8cc48f4abcea..3aabc172f047 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _STARMATH_HRC #define _STARMATH_HRC @@ -88,7 +89,6 @@ #define SID_DUMMY (SID_SMA_START + 254) -//#define RID_OPTIONSDIALOG (RID_APP_START + 1) #define RID_FONTDIALOG (RID_APP_START + 2) #define RID_FONTSIZEDIALOG (RID_APP_START + 3) #define RID_FONTTYPEDIALOG (RID_APP_START + 4) @@ -97,45 +97,31 @@ #define RID_PRINTOPTIONPAGE (RID_APP_START + 7) #define RID_SYMBOLDIALOG (RID_APP_START + 8) #define RID_SYMDEFINEDIALOG (RID_APP_START + 9) -#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10) #define RID_PRINTUIOPTIONS (RID_APP_START + 11) #define RID_MATH_TOOLBOX (RID_APP_START + 50) #define RID_DEFAULTSAVEQUERY (RID_APP_START + 102) -#define RID_WRITESYMBOLERROR (RID_APP_START + 202) -#define RID_READSYMBOLERROR (RID_APP_START + 203) #define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204) #define RID_OBJECTNAME (RID_APP_START + 501) // free #define RID_UNDOEDITNAME (RID_APP_START + 503) #define RID_UNDOFORMATNAME (RID_APP_START + 504) -#define RID_APPICO (RID_APP_START + 601) -#define RID_TMPICO (RID_APP_START + 603) #define RID_COMMANDMENU (RID_APP_START + 701) #define RID_VIEWMENU (RID_APP_START + 702) #define RID_DISTANCEMENU (RID_APP_START + 703) #define RID_FONTMENU (RID_APP_START + 704) -#define RID_STARTUPWINDOW (RID_APP_START + 800) #define RID_TOOLBOXWINDOW (RID_APP_START + 801) #define RID_CMDBOXWINDOW (RID_APP_START + 802) #define RID_FONTREGULAR (RID_APP_START + 804) #define RID_FONTITALIC (RID_APP_START + 805) #define RID_FONTBOLD (RID_APP_START + 806) -//#define RID_PRINTOPTION (RID_APP_START + 807) #define RID_DOCUMENTSTR (RID_APP_START + 808) #define RID_SYMBOLFILESSTR (RID_APP_START + 809) #define RID_ALLFILESSTR (RID_APP_START + 810) -#define RID_CREATORSTR (RID_APP_START + 811) -#define RID_FILESMFTYP (RID_APP_START + 812) -#define RID_FILESYMTYP (RID_APP_START + 813) -#define RID_SMMENU (RID_APP_START + 814) -#define RID_SMACCEL (RID_APP_START + 815) #define RID_STATUSBAR (RID_APP_START + 816) -#define RID_APPNAMESTR (RID_APP_START + 817) #define STR_MATH_DOCUMENT_FULLTYPE_CURRENT (RID_APP_START + 821) -#define RID_SMPLUGINMENU (RID_APP_START + 822) #define STR_STATSTR_READING (RID_APP_START + 823) #define STR_STATSTR_WRITING (RID_APP_START + 824) #define STR_CMDBOXWINDOW (RID_APP_START + 825) @@ -179,16 +165,7 @@ #define RID_ATTRIBUTES_CAT (RID_APP_START + 1106) #define RID_BRACKETS_CAT (RID_APP_START + 1107) #define RID_FORMAT_CAT (RID_APP_START + 1108) -#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109) -#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110) -#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111) -#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112) -#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113) -#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114) -#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115) -#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116) #define RID_MISC_CAT (RID_APP_START + 1117) -#define RID_MISC_CAT_HLP (RID_APP_START + 1118) // new resource ID's #define RID_PLUSX (RID_APP_START + 1201) @@ -241,8 +218,8 @@ #define RID_DLARROW (RID_APP_START + 1324) #define RID_DLRARROW (RID_APP_START + 1325) #define RID_DRARROW (RID_APP_START + 1326) -// Game theory +// Game theory #define RID_XPRECEDESY (RID_APP_START + 1327) #define RID_XNOTPRECEDESY (RID_APP_START + 1328) #define RID_XSUCCEEDSY (RID_APP_START + 1329) @@ -252,7 +229,6 @@ #define RID_XPRECEDESEQUIVY (RID_APP_START + 1333) #define RID_XSUCCEEDSEQUIVY (RID_APP_START + 1334) - #define RID_XINY (RID_APP_START + 1401) #define RID_XNOTINY (RID_APP_START + 1402) #define RID_XOWNSY (RID_APP_START + 1403) @@ -416,35 +392,9 @@ #define RID_MISC_MENU (RID_APP_START + 2172) #define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173) -#define RID_XPP_LINE (RID_APP_START + 3000) -#define RID_XPP_DLINE (RID_APP_START + 3001) -#define RID_XPP_SQRT (RID_APP_START + 3002) -#define RID_XPP_SQRT2 (RID_APP_START + 3003) -#define RID_XPP_HAT (RID_APP_START + 3004) -#define RID_XPP_TILDE (RID_APP_START + 3005) -#define RID_XPP_BAR (RID_APP_START + 3006) -#define RID_XPP_VEC (RID_APP_START + 3007) -#define RID_XPP_LBRACE (RID_APP_START + 3008) -#define RID_XPP_RBRACE (RID_APP_START + 3009) -#define RID_XPP_LPARENT (RID_APP_START + 3010) -#define RID_XPP_RPARENT (RID_APP_START + 3011) -#define RID_XPP_LANGLE (RID_APP_START + 3012) -#define RID_XPP_RANGLE (RID_APP_START + 3013) -#define RID_XPP_LBRACKET (RID_APP_START + 3014) -#define RID_XPP_RBRACKET (RID_APP_START + 3015) -#define RID_XPP_LDBRACKET (RID_APP_START + 3016) -#define RID_XPP_RDBRACKET (RID_APP_START + 3017) -#define RID_XPP_LCEIL (RID_APP_START + 3018) -#define RID_XPP_RCEIL (RID_APP_START + 3019) -#define RID_XPP_LFLOOR (RID_APP_START + 3020) -#define RID_XPP_RFLOOR (RID_APP_START + 3021) -#define RID_XPP_OVERBRACE (RID_APP_START + 3022) -#define RID_XPP_UNDERBRACE (RID_APP_START + 3023) - #define RID_LOCALIZED_NAMES (RID_APP_START + 3101) #define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102) #define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103) -#define RID_LOCALIZED_SYMBOLSET_NAMES (RID_APP_START + 3104) #define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105) #define RID_EXPORT_SYMBOLSET_NAMES (RID_APP_START + 3106) #define RID_FRENCH_50_NAMES (RID_APP_START + 3107) diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc index 2131d52342e8..d14c51e5b6c5 100644 --- a/svl/inc/svl/solar.hrc +++ b/svl/inc/svl/solar.hrc @@ -37,82 +37,66 @@ #define CREATERESMGR( Name ) ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) ) #define RID_SFX_START 260 -#define RID_SFX_END 9999 +// RID_SFX_END 9999 #define RID_LIB_START 10000 #define RID_LIB_END 19999 #define RID_SVX_START (RID_LIB_START) -#define RID_SVX_END (RID_LIB_START+499) +// RID_SVX_END (RID_LIB_START+499) -#define RID_SBASIC_START (RID_LIB_START+500) -#define RID_SBASIC_END (RID_LIB_START+2999) +// free: 500-2999 #define RID_BASIC_START (RID_LIB_START+3000) -#define RID_BASIC_END (RID_LIB_START+4499) +// RID_BASIC_END (RID_LIB_START+4499) #define RID_UUI_START (RID_LIB_START+4500) -#define RID_UUI_END (RID_LIB_START+4599) +// RID_UUI_END (RID_LIB_START+4599) -#define RID_HELP_START (RID_LIB_START+4600) -#define RID_HELP_END (RID_LIB_START+4799) - -#define RID_MAIL_START (RID_LIB_START+4800) -#define RID_MAIL_END (RID_LIB_START+4849) +// free: 4600-4849 #define RID_BASICIDE_START (RID_LIB_START+4850) -#define RID_BASICIDE_END (RID_LIB_START+4949) +// RID_BASICIDE_END (RID_LIB_START+4949) #define RID_SVXITEMS_START (RID_LIB_START+4950) #define RID_SVXITEMS_END (RID_LIB_START+5599) -#define RID_SBA_START (RID_LIB_START+5600) -#define RID_SBA_END (RID_LIB_START+5649) - -#define RID_ISETBRW_START (RID_LIB_START+5650) -#define RID_ISETBRW_END (RID_LIB_START+5699) +// free: 5600-5699 #define RID_EXTENSIONS_START (RID_LIB_START+5700) -#define RID_EXTENSIONS_END (RID_LIB_START+5799) +// RID_EXTENSIONS_END (RID_LIB_START+5799) #define RID_EDIT_START (RID_LIB_START+5800) #define RID_EDIT_END (RID_LIB_START+6369) #define RID_FPICKER_START (RID_LIB_START+6370) -#define RID_FPICKER_END (RID_LIB_START+6389) +// RID_FPICKER_END (RID_LIB_START+6389) #define RID_SVTOOLS_START (RID_LIB_START+6390) -#define RID_SVTOOLS_END (RID_LIB_START+6499) - -#define RID_INET_START (RID_LIB_START+6500) -#define RID_INET_END (RID_LIB_START+6559) - -#define RID_SO2_START (RID_LIB_START+6560) -#define RID_SO2_END (RID_LIB_START+6599) +// RID_SVTOOLS_END (RID_LIB_START+6499) -#define RID_SI_START (RID_LIB_START+6600) -#define RID_SI_END (RID_LIB_START+6799) +// free: 6500-6799 #define RID_DLG_START (RID_LIB_START+6800) -#define RID_DLG_END (RID_LIB_START+6899) +// RID_DLG_END (RID_LIB_START+6899) #define RID_OFA_START (RID_LIB_START+6900) -#define RID_OFA_END (RID_LIB_START+7399) +// RID_OFA_END (RID_LIB_START+7399) #define RID_GOODIES_START (RID_LIB_START+7400) -#define RID_GOODIES_END (RID_LIB_START+7449) +// RID_GOODIES_END (RID_LIB_START+7449) #define RID_SVL_START (RID_LIB_START+7450) -#define RID_SVL_END (RID_LIB_START+7899) +// RID_SVL_END (RID_LIB_START+7899) #define RID_CHAOS_START (RID_LIB_START+7900) -#define RID_CHAOS_END (RID_LIB_START+7999) +// RID_CHAOS_END (RID_LIB_START+7999) #define RID_FORMS_START (RID_LIB_START+8000) -#define RID_FORMS_END (RID_LIB_START+8999) +// RID_FORMS_END (RID_LIB_START+8999) #define RID_FORMLAYER_START (RID_LIB_START+9000) -#define RID_FORMLAYER_END (RID_LIB_START+9199) +// RID_FORMLAYER_END (RID_LIB_START+9199) #define RID_DBACCESS_START (RID_LIB_START+9200) #define RID_DBACCESS_END (RID_LIB_START+9699) @@ -120,11 +104,10 @@ #define RID_MORE_EXTENSIONS_START (RID_LIB_START+9700) #define RID_MORE_EXTENSIONS_END (RID_LIB_START+9999) -#define RID_DB_EXTENSIONS_START (RID_LIB_START+10000) -#define RID_DB_EXTENSIONS_END (RID_LIB_START+10199) +// free: 10000-10199 #define RID_FILTER_START (RID_LIB_START+10200) -#define RID_FILTER_END (RID_LIB_START+10299) +// RID_FILTER_END (RID_LIB_START+10299) // do *NOT* add more ranges here, RID_LIB_END is (RID_LIB_START + 10000) @@ -132,31 +115,21 @@ #define RID_APP_END 31999 #define RID_SW_START (20000) -#define RID_SW_END (25999) +// RID_SW_END (25999) -#define RID_SC_START (26000) -#define RID_SC_END (26999) +// free: 26000-26999 #define RID_SD_START (27000) -#define RID_SD_END (27999) +// RID_SD_END (27999) #define RID_OBJ_START (30000) -#define RID_OBJ_END (32767) - -#define RID_SIM_START (RID_OBJ_START+ 0) -#define RID_SIM_END (RID_OBJ_START+ 255) - -#define RID_SMA_START (RID_OBJ_START+ 256) -#define RID_SMA_END (RID_OBJ_START+ 511) - -#define RID_SCH_START (RID_OBJ_START+ 512) -#define RID_SCH_END (RID_OBJ_START+ 767) +// RID_OBJ_END (32767) #define RID_RPT_START (RID_OBJ_START+768) -#define RID_RPT_END (RID_OBJ_START+1000) +// RID_RPT_END (RID_OBJ_START+1000) #define RID_FORMULA_START (RID_OBJ_START+1001) -#define RID_FORMULA_END (RID_OBJ_START+1200) +// RID_FORMULA_END (RID_OBJ_START+1200) // Help-Ids -------------------------------------------------------------- #define HID_OK_BUTTON 0 diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index de48b1273a77..541accd25e1d 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -92,7 +92,6 @@ #define STR_INVALIDPUFF (RID_SVTOOLS_START+126) #define STR_LIMITEDPUFF (RID_SVTOOLS_START+127) #define STR_OLDLIMITEDPUFF (RID_SVTOOLS_START+128) -#define RID_REGISTER_DIALOG (RID_SVTOOLS_START+129) #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) @@ -103,7 +102,6 @@ #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 RID_LIMITED_DIALOG (RID_SVTOOLS_START+140) #define STR_SVT_PRNDLG_START (RID_SVTOOLS_START+141) #define DLG_SVT_PRNDLG_PRNSETUPDLG (STR_SVT_PRNDLG_START+0) @@ -284,7 +282,6 @@ //............................................................................. // image lists -#define RID_IMG_EXPANDER (RID_SVTOOLS_IMAGELIST_START + 0) #define RID_SVTOOLS_IMAGELIST_BIG (RID_SVTOOLS_IMAGELIST_START + 1) #define RID_SVTOOLS_IMAGELIST_SMALL (RID_SVTOOLS_IMAGELIST_START + 2) #define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX (RID_SVTOOLS_IMAGELIST_START + 3) @@ -336,7 +333,6 @@ #define IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL (RID_SVTOOLS_START + 78) #define IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE (RID_SVTOOLS_START + 79) -#define RID_IMG_PRNDLG_COLLATE (STR_SVT_PRNDLG_START + 29) #define RID_IMG_PRNDLG_NOCOLLATE (STR_SVT_PRNDLG_START + 30) // IAccessible2 implementation in 2009 diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc index 32268389ce5f..59c08eaf7a4a 100644 --- a/svx/inc/accessibility.hrc +++ b/svx/inc/accessibility.hrc @@ -42,7 +42,6 @@ #define RID_SVXSTR_A11Y_STYLE (RID_SVXSTR_ACCESSIBILITY_START + 10) #define RID_SVXSTR_A11Y_AND (RID_SVXSTR_ACCESSIBILITY_START + 11) - // SvxRectCtl & children #define RID_SVXSTR_RECTCTL_ACC_START (RID_SVXSTR_ACCESSIBILITY_START + 20) #define RID_SVXSTR_RECTCTL_ACC_CORN_NAME (RID_SVXSTR_RECTCTL_ACC_START + 0) @@ -75,9 +74,6 @@ #define RID_SVXSTR_GRAPHCTRL_ACC_NAME (RID_SVXSTR_GRAPHCTRL_ACC_START + 0) #define RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION (RID_SVXSTR_GRAPHCTRL_ACC_START + 1) -// text paragraphs -#define RID_SVXSTR_A11Y_TEXTHELPER_START (RID_SVXSTR_ACCESSIBILITY_START + 70) - // SvxShowCharSetAcc #define RID_SVXSTR_CHARACTER_SELECTION (RID_SVXSTR_ACCESSIBILITY_START + 80) #define RID_SVXSTR_CHARACTER_CODE (RID_SVXSTR_ACCESSIBILITY_START + 81) diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 8405bb2b6238..e1f334ed66ab 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -43,10 +43,6 @@ #define RID_SVXSTR_EXTFORMAT2_UI (RID_SVX_GALLERY_START + 18) #define RID_SVXSTR_EXTFORMAT3_SYS (RID_SVX_GALLERY_START + 19) #define RID_SVXSTR_EXTFORMAT3_UI (RID_SVX_GALLERY_START + 20) -#define RID_SVXSTR_EXTFORMAT4_SYS (RID_SVX_GALLERY_START + 21) -#define RID_SVXSTR_EXTFORMAT4_UI (RID_SVX_GALLERY_START + 22) -#define RID_SVXSTR_EXTFORMAT5_SYS (RID_SVX_GALLERY_START + 23) -#define RID_SVXSTR_EXTFORMAT5_UI (RID_SVX_GALLERY_START + 24) #define RID_SVXSTR_GALLERY_FOPENERROR (RID_SVX_GALLERY_START + 11) #define RID_SVXSTR_GALLERY_NOTHEME (RID_SVX_GALLERY_START + 13) #define RID_SVXSTR_GALLERY_DELETEOBJ (RID_SVX_GALLERY_START + 14) @@ -74,7 +70,6 @@ // Images #define RID_SVXBMP_GALLERY (RID_SVX_GALLERY_START + 46) -#define RID_SVXBMP_THEME (RID_SVX_GALLERY_START + 47) #define RID_SVXBMP_THEME_NORMAL (RID_SVX_GALLERY_START + 48) #define RID_SVXBMP_THEME_IMPORTED (RID_SVX_GALLERY_START + 50) #define RID_SVXBMP_THEME_READONLY (RID_SVX_GALLERY_START + 52) @@ -83,7 +78,6 @@ #define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) // Gallery-Bitmaps fuer Sounds -#define RID_SVXBMP_GALLERY_SOUND_0 (RID_SVX_GALLERY_START + 61) #define RID_SVXBMP_GALLERY_SOUND_1 (RID_SVX_GALLERY_START + 62) #define RID_SVXBMP_GALLERY_SOUND_2 (RID_SVX_GALLERY_START + 63) #define RID_SVXBMP_GALLERY_SOUND_3 (RID_SVX_GALLERY_START + 64) diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 0c56983f74b6..201e7f9b95df 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -24,11 +24,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _SVX_DIALOGS_HRC #define _SVX_DIALOGS_HRC -// include ------------------------------------------------------------------ - #include <svx/svxids.hrc> #include <sfx2/dialogs.hrc> @@ -58,8 +57,6 @@ #define RID_SVXSTR_GALLERY_THEMENAME (RID_SVX_START + 253) #define RID_SVXSTR_GALLERY_FILESFOUND (RID_SVX_START + 254) #define RID_SVXSTR_GALLERY_PREVIEW (RID_SVX_START + 255) -//-----IAccessibility2 Implementation 2009 - // factory IDs of tabpages implemented in CUI #define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) @@ -169,11 +166,6 @@ #define RID_SC_TP_DEFAULTS (RID_OFA_START + 253) //--------------------------------------------------------------------- -// ResId's fuer die Zeichen-TabPages -#define RID_SVXPAGE_CHAR_STD (RID_SVX_START + 3) -#define RID_SVXPAGE_CHAR_EXT (RID_SVX_START + 4) - -// moved ids +8 ... +17 to "ModalDialog" resource ids // ResId fuer den Suchen/Ersetzen-Dialog #define RID_SVXDLG_SEARCH (RID_SVX_START + 20) @@ -184,15 +176,10 @@ #define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28) // ResId's fuer Dialoge aus StarDraw -#define RID_SVXPAGE_POSITION (RID_SVX_START + 46) -#define RID_SVXPAGE_SIZE (RID_SVX_START + 47) #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) #define RID_SVXIL_FRAME (RID_SVX_START + 65) -#define RID_SVXDLG_3D (RID_SVX_START + 70) -#define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71) -#define RID_SVXPAGE_3DATTR (RID_SVX_START + 72) #define RID_SVXFLOAT_3D (RID_SVX_START + 209) #define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210) @@ -208,17 +195,9 @@ #define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78) #define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84) -// 67 to 71 free - -// ResId for the grid dialog -#define RID_SVXDLG_GRID (RID_SVX_START + 79) - // ResId's for the FontMenu controls #define RID_MN_FONTSIZE (RID_SVX_START + 80) -// ResId's for Undo-TbxControls -#define RID_SVXTBX_UNDO (RID_SVX_START + 81) - // ResId for zoom popup menu #define RID_SVXMNU_ZOOM (RID_SVX_START + 82) @@ -238,9 +217,6 @@ #define RID_SVXBMP_SLIDERDECREASE (RID_SVX_START + 68) #define RID_SVXBMP_SLIDERINCREASE (RID_SVX_START + 69) -// Resource with bitmaps for the CheckListBox -#define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91) - // Menu for the ruler #define RID_SVXMN_RULER (RID_SVX_START + 92) @@ -261,85 +237,22 @@ #define RID_SVXBMP_FONTWORK_FORM11 (RID_SVX_START + 104) #define RID_SVXBMP_FONTWORK_FORM12 (RID_SVX_START + 105) -#define RID_SVXBMP_SHADOW_XDIST (RID_SVX_START + 110) -#define RID_SVXBMP_SHADOW_YDIST (RID_SVX_START + 111) -#define RID_SVXBMP_SHADOW_ANGLE (RID_SVX_START + 112) -#define RID_SVXBMP_SHADOW_SIZE (RID_SVX_START + 113) #define RID_SVXCTRL_COLOR (RID_SVX_START + 117) // for Toolbox-Control style #define RID_SVXTBX_STYLE (RID_SVX_START + 120) -#define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140) #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141) -// ResId for InternetPage -#define RID_SVXPAGE_INTERNET (RID_SVX_START + 154) - -//InetDlg -#define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158) -#define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159) - -#define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202) -#define RID_CACHE_EXTRA_DLG (RID_SVX_START + 203) - -// OnlineRegistration -#define RID_SVXDLG_REGISTER (RID_SVX_START + 193) -#define RID_SVXPAGE_REGISTER_1 (RID_SVX_START + 194) -#define RID_SVXPAGE_REGISTER_2 (RID_SVX_START + 195) -#define RID_SVXPAGE_REGISTER_3 (RID_SVX_START + 196) -#define RID_SVXPAGE_REGISTER_4 (RID_SVX_START + 197) -#define RID_SVXPAGE_REGISTER_5 (RID_SVX_START + 198) -#define RID_SVXPAGE_REGISTER_6 (RID_SVX_START + 199) - -// 3D distance/perspective bitmaps -#define RID_SVXBMP_3D_DISTANCE_01 (RID_SVX_START + 162) -#define RID_SVXBMP_3D_DISTANCE_02 (RID_SVX_START + 163) -#define RID_SVXBMP_3D_DISTANCE_03 (RID_SVX_START + 164) -#define RID_SVXBMP_3D_DISTANCE_04 (RID_SVX_START + 165) -#define RID_SVXBMP_3D_DISTANCE_05 (RID_SVX_START + 166) -#define RID_SVXBMP_3D_DISTANCE_06 (RID_SVX_START + 167) -#define RID_SVXBMP_3D_DISTANCE_07 (RID_SVX_START + 168) -#define RID_SVXBMP_3D_DISTANCE_08 (RID_SVX_START + 169) -#define RID_SVXBMP_3D_DISTANCE_09 (RID_SVX_START + 170) -#define RID_SVXBMP_3D_DISTANCE_10 (RID_SVX_START + 171) - -#define RID_SVXBMP_3D_FOCAL_LENGTH_01 (RID_SVX_START + 172) -#define RID_SVXBMP_3D_FOCAL_LENGTH_02 (RID_SVX_START + 173) -#define RID_SVXBMP_3D_FOCAL_LENGTH_03 (RID_SVX_START + 174) -#define RID_SVXBMP_3D_FOCAL_LENGTH_04 (RID_SVX_START + 175) -#define RID_SVXBMP_3D_FOCAL_LENGTH_05 (RID_SVX_START + 176) -#define RID_SVXBMP_3D_FOCAL_LENGTH_06 (RID_SVX_START + 177) -#define RID_SVXBMP_3D_FOCAL_LENGTH_07 (RID_SVX_START + 178) -#define RID_SVXBMP_3D_FOCAL_LENGTH_08 (RID_SVX_START + 179) -#define RID_SVXBMP_3D_FOCAL_LENGTH_09 (RID_SVX_START + 180) -#define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181) - -// Ids fuer auto correction -#define RID_SVX_AUTOCORR (RID_SVX_START + 192) - -// Choice for external linguistics -#define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193) - -// TabPage and dialog for LDAP server -#define RID_SVXPAGE_LDAP (RID_SVX_START + 204) -#define RID_SVXDLG_LDAP (RID_SVX_START + 205) - // Dialog for functions #define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206) // QueryBox for Exit Recovery Wizard #define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215) -// ResId for the ImportGraphic dialog -#define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499) - - #define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226) -// ResId's for hyperlink dialog tabpages - // ResId's for Starone impl. bitmaps #define RID_UNODRAW_OBJECTS (RID_SVX_START + 233) #define RID_UNODRAW_OLE2 (RID_SVX_START + 234) @@ -358,36 +271,16 @@ // Strings ------------------------------------------------------------------ - // Strings for the language -#define RID_SVXSTR_LANGUAGE_BEGIN (RID_SVX_START + 0) #define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START + 15) -// Messages for the DBMgr -#define RID_SVXSTR_DBINI (RID_SVX_START + 60) -#define RID_SVXSTR_DBDRV (RID_SVX_START + 61) -#define RID_SVXSTR_NODBDRV (RID_SVX_START + 62) -#define RID_SVXSTR_DBCANTOPEN (RID_SVX_START + 63) -#define RID_SVXSTR_DBINACTIVE (RID_SVX_START + 64) -#define RID_SVXSTR_SELECT (RID_SVX_START + 65) -#define RID_SVXSTR_DESELECT (RID_SVX_START + 66) -#define RID_SVXSTR_MERGE (RID_SVX_START + 67) -#define RID_SVXSTR_INSERT (RID_SVX_START + 68) -#define RID_SVXSTR_NOSELECT (RID_SVX_START + 69) -#define RID_SVXSTR_CANT_OPEN_DB (RID_SVX_START + 70) -#define RID_SVXSTR_INVALID_RECORD (RID_SVX_START + 71) -#define RID_SVXSTR_NOSET_MATCHING (RID_SVX_START + 72) - // Strings from the search dialog #define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80) #define RID_SVXSTR_SEARCH (RID_SVX_START + 81) #define RID_SVXSTR_REPLACE (RID_SVX_START + 82) -#define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144) // ResIds for the PageDialog -#define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146) -#define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147) // Strings of the ToolBox-Controls from tbcontrl.cxx #define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191) @@ -398,13 +291,6 @@ #define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197) #define RID_SVXSTR_MORE (RID_SVX_START + 198) - -// Strings for the UndoTbxControls -#define RID_SVXSTR_UNDO (RID_SVX_START + 200) -#define RID_SVXSTR_REDO (RID_SVX_START + 201) -#define RID_SVXSTR_ACTION (RID_SVX_START + 202) -#define RID_SVXSTR_ACTIONS (RID_SVX_START + 203) - // Strings for insert/overwrite mode #define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210) #define RID_SVXSTR_OVERWRITE_HELPTEXT (RID_SVX_START + 211) @@ -420,11 +306,6 @@ #define RID_SVXSTR_XMLSEC_NO_SIG (RID_SVX_START + 225) #define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226) -// further ID at 219 - -// String-ResId for the ImportGraphic dialog -#define RID_SVXSTR_ALL_FILES (RID_SVX_START + 241) - // Strings for the ruler #define RID_SVXSTR_RULER_START (RID_SVX_START + 245) #define RID_SVXSTR_RULER_TAB_LEFT (RID_SVX_START + 245) @@ -482,40 +363,29 @@ // String-Arrays #define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312) -// Hyperlink dialog -#define RID_SVXMN_HYPERLINK (RID_SVX_START + 321) -// Hyperlink query boxes -#define RID_SVXQB_NOCONNECT (RID_SVX_START + 322) -#define RID_SVXQB_DONTEXIST (RID_SVX_START + 323) -//color configuration - // Graphic filter -#define RID_SVX_GRFFILTER_START (RID_SVX_START + 330) #define RID_SVXTBX_GRFFILTER (RID_SVX_START + 331) #define RID_SVXERRCODE (RID_SVX_START + 350) // gallery #define RID_SVX_GALLERY_START (RID_SVX_START + 360) -#define RID_SVX_GALLERY_END (RID_SVX_START + 410) - -#define RID_SVXSTR_MEM_ERROR (RID_SVX_START + 415) -#define RID_SVXSTR_DLG_TITLE_INFO (RID_SVX_START + 416) +// RID_SVX_GALLERY_END (RID_SVX_START + 410) // Define - Region for bitmap masking // !!! don't use defines from this region !!! #define RID_SVX_BMPMASK_START (RID_SVX_START + 420) -#define RID_SVX_BMPMASK_END (RID_SVX_START + 440) +// RID_SVX_BMPMASK_END (RID_SVX_START + 440) // Define - Region for IMAP editor // !!! don't use defines from this region !!! #define RID_SVX_IMAP_START (RID_SVX_START + 450) -#define RID_SVX_IMAP_END (RID_SVX_START + 460) +// RID_SVX_IMAP_END (RID_SVX_START + 460) // Define - Region for contour editor // !!! don't use defines from this region !!! #define RID_SVX_CONTOUR_START (RID_SVX_START + 461) -#define RID_SVX_CONTOUR_END (RID_SVX_START + 471) +// RID_SVX_CONTOUR_END (RID_SVX_START + 471) #define RID_SVXIMG_GRAF_RED (RID_SVX_START + 472) #define RID_SVXIMG_GRAF_GREEN (RID_SVX_START + 473) @@ -552,8 +422,6 @@ #define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)//? #define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//? -#define RID_STR_BULLET_THEME (RID_SVX_START + 508) - // ResIds for graphics drawmode #define RID_SVXSTR_GRAFMODE_STANDARD (RID_SVX_START + 520) @@ -798,7 +666,7 @@ #define RID_SVXSTR_GRDT_DEF_START RID_SVXSTR_GRDT0_DEF #define RID_SVXSTR_GRDT_DEF_END RID_SVXSTR_GRDT58_DEF #define RID_SVXSTR_GRDT_START RID_SVXSTR_GRDT0 -#define RID_SVXSTR_GRDT_END RID_SVXSTR_GRDT58 +// RID_SVXSTR_GRDT_END RID_SVXSTR_GRDT58 // Default-Hatch-Names #define RID_SVXSTR_HATCH0_DEF (RID_SVX_START + 661) @@ -826,7 +694,7 @@ #define RID_SVXSTR_HATCH_DEF_START RID_SVXSTR_HATCH0_DEF #define RID_SVXSTR_HATCH_DEF_END RID_SVXSTR_HATCH10_DEF #define RID_SVXSTR_HATCH_START RID_SVXSTR_HATCH0 -#define RID_SVXSTR_HATCH_END RID_SVXSTR_HATCH10 +// RID_SVXSTR_HATCH_END RID_SVXSTR_HATCH10 // Default-Bitmap-Names #define RID_SVXSTR_BMP0_DEF (RID_SVX_START + 691) @@ -876,7 +744,7 @@ #define RID_SVXSTR_BMP_DEF_START RID_SVXSTR_BMP0_DEF #define RID_SVXSTR_BMP_DEF_END RID_SVXSTR_BMP21_DEF #define RID_SVXSTR_BMP_START RID_SVXSTR_BMP0 -#define RID_SVXSTR_BMP_END RID_SVXSTR_BMP21 +// RID_SVXSTR_BMP_END RID_SVXSTR_BMP21 // Default-Linestyle-Names #define RID_SVXSTR_DASH0_DEF (RID_SVX_START + 740) @@ -908,7 +776,7 @@ #define RID_SVXSTR_DASH_DEF_START RID_SVXSTR_DASH0_DEF #define RID_SVXSTR_DASH_DEF_END RID_SVXSTR_DASH12_DEF #define RID_SVXSTR_DASH_START RID_SVXSTR_DASH0 -#define RID_SVXSTR_DASH_END RID_SVXSTR_DASH12 +// RID_SVXSTR_DASH_END RID_SVXSTR_DASH12 // Default-Line-End-Names // Shifted numbers. Old value range from +770 to +795 is unused now @@ -957,7 +825,7 @@ #define RID_SVXSTR_LEND_DEF_START RID_SVXSTR_LEND0_DEF #define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND20_DEF #define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0 -#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND20 +// RID_SVXSTR_LEND_END RID_SVXSTR_LEND20 #define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802) #define RID_SVXSTR_QRY_PRINT_MSG (RID_SVX_START + 803) @@ -989,7 +857,7 @@ #define RID_SVXSTR_TRASNGR_DEF_START RID_SVXSTR_TRASNGR0_DEF #define RID_SVXSTR_TRASNGR_DEF_END RID_SVXSTR_TRASNGR0_DEF #define RID_SVXSTR_TRASNGR_START RID_SVXSTR_TRASNGR0 -#define RID_SVXSTR_TRASNGR_END RID_SVXSTR_TRASNGR0 +// RID_SVXSTR_TRASNGR_END RID_SVXSTR_TRASNGR0 #define RID_SVXSTR_BORDER_CONTROL (RID_SVX_START + 852) @@ -997,7 +865,7 @@ // svx/inc/accessibility.hrc, the strings are defined in // svx/source/accessibility/accessibility.src #define RID_SVXSTR_ACCESSIBILITY_START (RID_SVX_START + 860) -#define RID_SVXSTR_ACCESSIBILITY_END (RID_SVX_START + 950) +// RID_SVXSTR_ACCESSIBILITY_END (RID_SVX_START + 950) // 984: free #define RID_SVXFLOAT_EXTRUSION_DIRECTION (RID_SVX_START + 985) @@ -1108,7 +976,6 @@ // ---------------------------------------------------------------------------- // "Menu" resource ids -#define RID_SVX_MDLG_SCRIPTORG_NEWLIB ( RID_SVX_START + 7 ) #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) // document recovery and error report diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc index 24637babb057..e47aeb63f96e 100644 --- a/svx/inc/svx/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc @@ -70,10 +70,7 @@ #define RID_SVXIMG_NAVIGATIONBAR SID_FM_NAVIGATIONBAR // Dialog-Id's ----------------------------------------------------------- -#define RID_SVXTBX_FORM (RID_FORMS_START + 1) #define TBX_FORM (RID_FORMS_START + 2) -#define RID_SVXDLG_ADD_TABLE (RID_FORMS_START + 3) -#define RID_SVXDLG_TAB_ORDER (RID_FORMS_START + 4) #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) @@ -133,11 +130,9 @@ #define RID_STR_UNDO_CONTAINER_REMOVE (RID_FORMS_START + 16) #define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE (RID_FORMS_START + 27) #define RID_STR_UNDO_CONTAINER_REPLACE (RID_FORMS_START + 28) -#define RID_STR_UNDO_TABORDER (RID_FORMS_START + 29) #define RID_STR_UNDO_DELETE_LOGICAL (RID_FORMS_START + 30) #define RID_STR_UNDO_MODEL_REPLACE (RID_FORMS_START + 31) #define RID_STR_NAVIGATIONBAR (RID_FORMS_START + 32) -#define RID_STR_DEFAULT_CONTROL (RID_FORMS_START + 33) #define RID_STR_FORM (RID_FORMS_START + 36) #define RID_STR_FIELDSELECTION (RID_FORMS_START + 37) #define RID_STR_NO_PROPERTIES (RID_FORMS_START + 38) diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index 4a526b9738e4..f15e66e7bac7 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -24,11 +24,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #ifndef _SVXITEMS_HRC #define _SVXITEMS_HRC -// include ------------------------------------------------------------------ - #include <svl/solar.hrc> // Extras ------------------------------------------------------------------- @@ -36,31 +35,26 @@ // SvxSearchItem ------------------------------------------------------------ // Kommando -#define RID_SVXITEMS_SEARCHCMD_BEGIN (RID_SVXITEMS_START + 10) #define RID_SVXITEMS_SEARCHCMD_FIND (RID_SVXITEMS_START + 10) #define RID_SVXITEMS_SEARCHCMD_FIND_ALL (RID_SVXITEMS_START + 11) #define RID_SVXITEMS_SEARCHCMD_REPLACE (RID_SVXITEMS_START + 12) #define RID_SVXITEMS_SEARCHCMD_REPLACE_ALL (RID_SVXITEMS_START + 13) // Vorlagen -#define RID_SVXITEMS_SEARCHSTYLE_BEGIN (RID_SVXITEMS_START + 14) #define RID_SVXITEMS_SEARCHSTYL_CHAR (RID_SVXITEMS_START + 14) #define RID_SVXITEMS_SEARCHSTYL_PARA (RID_SVXITEMS_START + 15) #define RID_SVXITEMS_SEARCHSTYL_FRAME (RID_SVXITEMS_START + 16) #define RID_SVXITEMS_SEARCHSTYL_PAGE (RID_SVXITEMS_START + 17) // Zellen-Typ -#define RID_SVXITEMS_SEARCHIN_BEGIN (RID_SVXITEMS_START + 20) #define RID_SVXITEMS_SEARCHIN_FORMULA (RID_SVXITEMS_START + 20) #define RID_SVXITEMS_SEARCHIN_VALUE (RID_SVXITEMS_START + 21) #define RID_SVXITEMS_SEARCHIN_NOTE (RID_SVXITEMS_START + 22) // Applikation -#define RID_SVXITEMS_SEARCHAPP_BEGIN (RID_SVXITEMS_START + 25) #define RID_SVXITEMS_SEARCHAPP_WRITER (RID_SVXITEMS_START + 25) #define RID_SVXITEMS_SEARCHAPP_CALC (RID_SVXITEMS_START + 26) #define RID_SVXITEMS_SEARCHAPP_DRAW (RID_SVXITEMS_START + 27) #define RID_SVXITEMS_SEARCHAPP_BASE (RID_SVXITEMS_START + 28) // enum BrushStyle ---------------------------------------------------------- -#define RID_SVXITEMS_BRUSHSTYLE_BEGIN (RID_SVXITEMS_START + 45) #define RID_SVXITEMS_BRUSHSTYLE_NULL (RID_SVXITEMS_START + 45) #define RID_SVXITEMS_BRUSHSTYLE_SOLID (RID_SVXITEMS_START + 46) #define RID_SVXITEMS_BRUSHSTYLE_HORZ (RID_SVXITEMS_START + 47) @@ -74,36 +68,6 @@ #define RID_SVXITEMS_BRUSHSTYLE_75 (RID_SVXITEMS_START + 55) #define RID_SVXITEMS_BRUSHSTYLE_BITMAP (RID_SVXITEMS_START + 56) -// enum FontFamily ------------------------------------------------------- -#define RID_SVXITEMS_FONTFAMILY_BEGIN (RID_SVXITEMS_START + 100) -#define RID_SVXITEMS_FONTFAMILY_DONTKNOW (RID_SVXITEMS_START + 100) -#define RID_SVXITEMS_FONTFAMILY_DECORATIVE (RID_SVXITEMS_START + 101) -#define RID_SVXITEMS_FONTFAMILY_MODERN (RID_SVXITEMS_START + 102) -#define RID_SVXITEMS_FONTFAMILY_ROMAN (RID_SVXITEMS_START + 103) -#define RID_SVXITEMS_FONTFAMILY_SCRIPT (RID_SVXITEMS_START + 104) -#define RID_SVXITEMS_FONTFAMILY_SWISS (RID_SVXITEMS_START + 105) -#define RID_SVXITEMS_FONTFAMILY_SYSTEM (RID_SVXITEMS_START + 106) - -// enum FontPitch -------------------------------------------------------- -#define RID_SVXITEMS_FONTPITCH_BEGIN (RID_SVXITEMS_START + 110) -#define RID_SVXITEMS_FONTPITCH_DONTKNOW (RID_SVXITEMS_START + 110) -#define RID_SVXITEMS_FONTPITCH_FIXED (RID_SVXITEMS_START + 111) -#define RID_SVXITEMS_FONTPITCH_VARIABLE (RID_SVXITEMS_START + 112) - -// enum CharSet ---------------------------------------------------------- -#define RID_SVXITEMS_CHARSET_BEGIN (RID_SVXITEMS_START + 145) -#define RID_SVXITEMS_CHARSET_DONTKNOW (RID_SVXITEMS_START + 145) -#define RID_SVXITEMS_CHARSET_ANSI (RID_SVXITEMS_START + 146) -#define RID_SVXITEMS_CHARSET_MAC (RID_SVXITEMS_START + 147) -#define RID_SVXITEMS_CHARSET_IBMPC_437 (RID_SVXITEMS_START + 148) -#define RID_SVXITEMS_CHARSET_IBMPC_850 (RID_SVXITEMS_START + 149) -#define RID_SVXITEMS_CHARSET_IBMPC_860 (RID_SVXITEMS_START + 150) -#define RID_SVXITEMS_CHARSET_IBMPC_861 (RID_SVXITEMS_START + 151) -#define RID_SVXITEMS_CHARSET_IBMPC_863 (RID_SVXITEMS_START + 152) -#define RID_SVXITEMS_CHARSET_IBMPC_865 (RID_SVXITEMS_START + 153) -#define RID_SVXITEMS_CHARSET_SYSTEM (RID_SVXITEMS_START + 154) -#define RID_SVXITEMS_CHARSET_SYMBOL (RID_SVXITEMS_START + 155) - // enum SvxCellOrientation #define RID_SVXITEMS_ORI_STANDARD (RID_SVXITEMS_START + 410) #define RID_SVXITEMS_ORI_TOPBOTTOM (RID_SVXITEMS_START + 411) diff --git a/svx/inc/svx/ucsubset.hrc b/svx/inc/svx/ucsubset.hrc index 920c52ebdf8c..6ffd2f9b3aea 100644 --- a/svx/inc/svx/ucsubset.hrc +++ b/svx/inc/svx/ucsubset.hrc @@ -31,7 +31,6 @@ // (see the Unicode spec and TrueType::OS2.ulUnicodeRange description) #define RID_SUBSETMAP 1243 #define RID_SUBSET_START (RID_SVX_START + 901) -#define RID_SUBSET_COUNT 95 #define RID_SUBSETSTR_BASIC_LATIN (RID_SUBSET_START + 0) #define RID_SUBSETSTR_LATIN_1 (RID_SUBSET_START + 1) @@ -152,4 +151,5 @@ #define RID_SUBSETSTR_BOPOMOFO_EXTENDED (RID_SUBSET_START + 225) #define RID_SUBSETSTR_KATAKANA_PHONETIC (RID_SUBSET_START + 226) -#define RID_SUBSET_END (RID_SUBSET_START + 299) +// RID_SUBSET_END (RID_SUBSET_START + 299) + diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index dc3c29515b52..e33d7f761cd5 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -30,85 +30,11 @@ #ifndef _OFF_APP_HRC #define _OFF_APP_HRC -// include --------------------------------------------------------------- - #include <svl/solar.hrc> #include <sfx2/sfxsids.hrc> -// Ranges ---------------------------------------------------------------- - -// PB: Vorsicht diesen Bereich hier im app.hrc nicht mehr benutzen! -#define RID_OFA_LDAP_START (RID_OFA_START + 300) -#define RID_OFA_LDAP_END (RID_OFA_START + 349) - -// defines --------------------------------------------------------------- - -#define RID_QRY_SELECTMAILADDR (RID_OFA_START + 0) -#define RID_QRY_NEWMAILADDR (RID_OFA_START + 1) -#define RID_QRY_SELECTBRWADDR (RID_OFA_START + 2) -#define RID_QRY_NEWBRWADDR (RID_OFA_START + 3) -#define RID_QRY_NO_URL (RID_OFA_START + 4) -#define RID_QRY_NO_MAILADDR (RID_OFA_START + 5) -#define RID_QRY_NO_NAME (RID_OFA_START + 6) -#define RID_QRY_INVALID_URL (RID_OFA_START + 7) -#define RID_QRY_DEL_MAIL (RID_OFA_START + 8) -#define RID_QRY_ADDRESSBOOK (RID_OFA_START + 9) -#define RID_QRY_NO_ADDR (RID_OFA_START + 10) - - // String und ToolBox -#define RID_MAILTOOLBOX (RID_OFA_START + 112) -#define RID_QRY_SELECTADDR (RID_OFA_START + 13) - -#define RID_ICO_MSGVIEW (RID_OFA_START + 20) -#define RID_WIN_MAILHEADER (RID_OFA_START + 21) -#define RID_WIN_MAILATTACH (RID_OFA_START + 22) -#define RID_IMG_MAILTEXT (RID_OFA_START + 23) -#define RID_MSGDOC_MENU (RID_OFA_START + 24) -#define RID_ATTACH_MENU (RID_OFA_START + 25) -#define RID_HEADER_MENU (RID_OFA_START + 26) -#define RID_CALENDAR_WIN (RID_OFA_START + 27) -#define RID_STA_NEWSWIN_TITEL (RID_OFA_START + 28) -#define RID_SEND_MENU (RID_OFA_START + 29) - - -// Icons and Images ------------------------------------------------------ - -#define RID_ICO_TABLES (RID_OFA_START + 30) -#define RID_ICO_QUERIES (RID_OFA_START + 31) -#define RID_ICO_FORMS (RID_OFA_START + 32) -#define RID_ICO_REPORTS (RID_OFA_START + 33) -#define RID_ICO_DATABASE (RID_OFA_START + 34) -#define RID_IMG_ALTFOLDER_CLOSE (RID_OFA_START + 35) -#define RID_IMG_ALTFOLDER_OPEN (RID_OFA_START + 36) -#define RID_IMG_ALTFOLDER_PLUS (RID_OFA_START + 37) -#define RID_IMG_ALTFOLDER_MINUS (RID_OFA_START + 38) -#define RID_IMGLIST_PGP (RID_OFA_START + 39) -#define RID_IMGLIST_LARGE_PGP (RID_OFA_START + 40) - // Errors ---------------------------------------------------------------- -#define RID_ERR_OUTBOX (RID_OFA_START + 50) -#define RID_ERR_DB_OPENPROPERTIES (RID_OFA_START + 51) -#define RID_ERR_NO_EMAILADDRESS (RID_OFA_START + 52) -#define RID_QBOX_NOSUBJECT (RID_OFA_START + 53) -#define RID_ERRBOX_NORECIPIENTS (RID_OFA_START + 54) -#define RID_ERRBOX_NOSETTINGS (RID_OFA_START + 55) -#define RID_QBOX_ADDADDRESS (RID_OFA_START + 56) -#define RID_ERR_NO_DD_FOR_ADDRESSBOOK (RID_OFA_START + 57) -#define RID_QBOX_NORCPTS (RID_OFA_START + 58) -#define RID_QBOX_FORMATS (RID_OFA_START + 59) -#define RID_ERRBOX_NOVALIDRCPTS (RID_OFA_START + 60) -#define RID_QBOX_SAVEMAIL (RID_OFA_START + 61) -#define RID_WARNBOX_LOCKEDFILE (RID_OFA_START + 62) -#define RID_QBOX_COMPRESS (RID_OFA_START + 63) -#define RID_ERRBOX_APPENDADDRESS (RID_OFA_START + 64) -#define RID_QBOX_DELETEATTACHMENT (RID_OFA_START + 65) -#define RID_ERRBOX_NO_OUTBOX (RID_OFA_START + 66) -#define RID_WARNDLG_ONLY_ASCII (RID_OFA_START + 67) -#define RID_ERR_TABLE_LOCKED (RID_OFA_START + 68) -#define RID_ERR_OBJECT_LOCKED (RID_OFA_START + 69) -#define RID_ERR_NAME_INVALID (RID_OFA_START + 70) -#define RID_INFO_TABLE_NO_SELECT (RID_OFA_START + 71) #define RID_ERRBOX_MODULENOTINSTALLED (RID_OFA_START + 72) // Dialoge --------------------------------------------------------------- @@ -204,233 +130,13 @@ // Strings ------------------------------------------ -#define RID_STR_ROLE_TO (RID_OFA_START + 0) -#define RID_STR_ROLE_CC (RID_OFA_START + 1) -#define RID_STR_ROLE_BCC (RID_OFA_START + 2) -#define RID_STR_NEWMAIL (RID_OFA_START + 3) -#define RID_STR_MAIL (RID_OFA_START + 4) -#define RID_STR_DETACH (RID_OFA_START + 5) -#define RID_STR_SUBJECT (RID_OFA_START + 6) -#define RID_STR_AUTHOR (RID_OFA_START + 7) #define RID_STR_DATE (RID_OFA_START + 108) #define RID_DESKTOP (RID_OFA_START + 109) -#define RID_STR_ROLE_VIM (RID_OFA_START + 110) #define RID_RIDER_SLL_SITE (RID_OFA_START + 100) #define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101) -// Bitmaps --------------------------------------------------------------- - -#define RID_BMP_DB_DATABASE_S (RID_OFA_START + 150) -#define RID_BMP_DB_DATABASE_L (RID_OFA_START + 151) -#define RID_BMP_DB_TABLEFOLDER_S (RID_OFA_START + 152) -#define RID_BMP_DB_TABLEFOLDER_L (RID_OFA_START + 153) -#define RID_BMP_DB_TABLE_S (RID_OFA_START + 154) -#define RID_BMP_DB_TABLE_L (RID_OFA_START + 155) -#define RID_BMP_DB_QUERYFOLDER_S (RID_OFA_START + 156) -#define RID_BMP_DB_QUERYFOLDER_L (RID_OFA_START + 157) -#define RID_BMP_DB_QUERY_S (RID_OFA_START + 158) -#define RID_BMP_DB_QUERY_L (RID_OFA_START + 159) -#define RID_BMP_DB_FORMFOLDER_S (RID_OFA_START + 160) -#define RID_BMP_DB_FORMFOLDER_L (RID_OFA_START + 161) -#define RID_BMP_DB_FORM_S (RID_OFA_START + 162) -#define RID_BMP_DB_FORM_L (RID_OFA_START + 163) -#define RID_BMP_DB_REPORTFOLDER_S (RID_OFA_START + 164) -#define RID_BMP_DB_REPORTFOLDER_L (RID_OFA_START + 165) -#define RID_BMP_DB_REPORT_S (RID_OFA_START + 166) -#define RID_BMP_DB_REPORT_L (RID_OFA_START + 167) -#define RID_BMP_DB_STATEMENT_S (RID_OFA_START + 168) -#define RID_BMP_DB_STATEMENT_L (RID_OFA_START + 169) -#define RID_BMP_DB_VIEW_S (RID_OFA_START + 170) -#define RID_BMP_DB_VIEW_L (RID_OFA_START + 171) -#define RID_BMP_DB_RELATIONS_S (RID_OFA_START + 172) -#define RID_BMP_DB_RELATIONS_L (RID_OFA_START + 173) -#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) - -// don't use 12 and 13 !!! -// ..._BEGIN can be used again. Just for iteration here -#define RID_STR_PRIO_BEGIN (RID_OFA_START + 17) -#define RID_STR_PRIO_HIGHEST (RID_OFA_START + 18) -#define RID_STR_PRIO_HIGH (RID_OFA_START + 19) -#define RID_STR_PRIO_NORMAL (RID_OFA_START + 20) -#define RID_STR_PRIO_LOW (RID_OFA_START + 21) -#define RID_STR_PRIO_LOWEST (RID_OFA_START + 22) - -// Datenbank / Explorer - -#define RID_STR_NAME_DATABASE (RID_OFA_START + 23) -#define RID_STR_NAME_TABLES (RID_OFA_START + 24) -#define RID_STR_NAME_TABLE (RID_OFA_START + 25) -#define RID_STR_NAME_QUERIES (RID_OFA_START + 26) -#define RID_STR_NAME_QUERIE (RID_OFA_START + 27) -#define RID_STR_NAME_ADDRESSBOOK (RID_OFA_START + 28) -#define RID_STR_QRY_DESIGNVIEW (RID_OFA_START + 29) -#define RID_STR_QRY_SQLVIEW (RID_OFA_START + 30) -#define RID_STR_NAME_DATABASECONTENT (RID_OFA_START + 31) -#define RID_STR_TBL_DESIGNVIEW (RID_OFA_START + 32) -#define RID_STR_NAME_FORMS (RID_OFA_START + 33) -#define RID_STR_NAME_FORM (RID_OFA_START + 34) -#define RID_STR_NAME_REPORTS (RID_OFA_START + 35) -#define RID_STR_NAME_REPORT (RID_OFA_START + 36) -#define RID_STR_RPT_DESIGNVIEW (RID_OFA_START + 37) -#define RID_STR_FRM_DESIGNVIEW (RID_OFA_START + 38) -#define RID_STR_TBL_COMPRESS (RID_OFA_START + 39) -#define RID_STR_NAME_VIEW (RID_OFA_START + 40) -#define RID_STR_NAME_RELATIONS (RID_OFA_START + 41) -#define RID_STR_NAME_MANUAL_SQL (RID_OFA_START + 42) -#define RID_STR_ACTUALIZE (RID_OFA_START + 43) -#define RID_STR_NEW (RID_OFA_START + 44) -#define RID_STR_WIZARD (RID_OFA_START + 45) -#define RID_STR_IMPORTVCARD (RID_OFA_START + 46) -#define RID_STR_EXPORTVCARD (RID_OFA_START + 47) -#define RID_STR_ASK_COPY_REMAINING (RID_OFA_START + 48) -#define RID_STR_ASK_MOVE_REMAINING (RID_OFA_START + 49) -#define RID_STR_FRM_NEW_TEXTDOC (RID_OFA_START + 50) -#define RID_STR_FRM_NEW_CALCDOC (RID_OFA_START + 51) -#define RID_STR_FRM_NEW_IMPRESSDOC (RID_OFA_START + 52) -#define RID_STR_FRM_NEW_AUTODOC (RID_OFA_START + 53) -#define RID_STR_DB_REORGANIZE (RID_OFA_START + 54) -#define RID_STR_FRM_NEW_TEMPLATE (RID_OFA_START + 55) - -#define RID_STR_NEWSGROUP (RID_OFA_START + 61) - - -#define RID_STR_MESSAGE (RID_OFA_START + 64) -#define RID_STR_PRINTMSG_DOC (RID_OFA_START + 66) -#define RID_STR_PRINTMSG_SUBJECT (RID_OFA_START + 67) -#define RID_STR_PRINTMSG_DATE (RID_OFA_START + 68) -#define RID_STR_PRINTMSG_FROM (RID_OFA_START + 69) -#define RID_STR_PRINTMSG_TO (RID_OFA_START + 70) -#define RID_ERR_OPENNEWSSERVER (RID_OFA_START + 71) -#define RID_ERR_SENDNEWS (RID_OFA_START + 72) -#define RID_ERR_SENDMAIL (RID_OFA_START + 73) -#define RID_ERR_NOPRINTDOC (RID_OFA_START + 74) -#define RID_STR_ROLE_REPLY_TO (RID_OFA_START + 75) -#define RID_STR_ROLE_FOLLOWUP_TO (RID_OFA_START + 76) -#define RID_STR_BUTTON_SEND (RID_OFA_START + 77) -#define RID_STR_BUTTON_SAVE (RID_OFA_START + 78) -#define RID_STR_BUTTON_REJECT (RID_OFA_START + 79) -#define RID_STR_CLOSE_MESSAGE (RID_OFA_START + 80) -#define RID_STR_BUTTON_BACKTOMSG (RID_OFA_START + 81) -#define RID_STR_CLOSE_TITLE (RID_OFA_START + 82) -#define RID_STR_ASCII_FORMAT (RID_OFA_START + 83) - -// The following eight RIDs replace the message in RID_ERRBOX_NOSETTINGS: -#define RID_ERRSTR_SMTP_NO_SERVER (RID_OFA_START + 84) -#define RID_ERRSTR_NNTP_NO_SERVER (RID_OFA_START + 85) -#define RID_ERRSTR_VIM_PRIV_NO_USER (RID_OFA_START + 86) -#define RID_ERRSTR_VIM_PRIV_NO_USER_PWD (RID_OFA_START + 87) -#define RID_ERRSTR_VIM_PUB_NO_USER (RID_OFA_START + 88) -#define RID_ERRSTR_VIM_PUB_NO_USER_PWD (RID_OFA_START + 89) -#define RID_ERRSTR_CREATE_OUTBOX (RID_OFA_START + 90) -#define RID_ERRSTR_EDIT_OUTBOX (RID_OFA_START + 91) -#define RID_ERRSTR_EDIT_ACCOUNT_PRIV (RID_OFA_START + 92) -#define RID_ERRSTR_EDIT_ACCOUNT_PUB (RID_OFA_START + 93) - -#define RID_STR_NAME_USER_SETTINGS (RID_OFA_START + 94) -#define RID_STR_FRMORREP_NAMETOLONG (RID_OFA_START + 95) -#define RID_STR_TBL_CREATE_BACKUP (RID_OFA_START + 96) -#define RID_STR_DB_SWITCH_FAVORITE (RID_OFA_START + 97) -#define RID_STR_DB_FAVORITE_TTILE (RID_OFA_START + 98) - - -// unnamed resources ---------------------------------------------------- -#define OFA_RES_UNNAMED_START (RID_OFA_START + 200) - -#define RID_RES_SBACHAOS_ERR_CONTEXTS (OFA_RES_UNNAMED_START + 1) -// HelpIds --------------------------------------------------------------- -/* -#define HID_AUTOCORR_DLG (HID_OFA_START + 0) -#define HID_OFAPAGE_AUTOCORR_OPTIONS (HID_OFA_START + 1) -#define HID_OFAPAGE_AUTOCORR_REPLACE (HID_OFA_START + 2) -#define HID_OFAPAGE_AUTOCORR_EXCEPT (HID_OFA_START + 3) -#define HID_OFACTL_AUTOCORR_REPLACE (HID_OFA_START + 4) -#define HID_OFAWIN_MAIL_HEADER (HID_OFA_START + 5) -#define HID_OFAWIN_MAIL_ATTACH (HID_OFA_START + 6) -#define HID_OFACTL_MAIL_ATTACH (HID_OFA_START + 7) -#define HID_OFA_TP_MISC (HID_OFA_START + 8) -#define HID_OFA_HYPERLINK (HID_OFA_START + 10) -#define HID_OFA_DLGTABNEW (HID_OFA_START + 11) -#define HID_OFA_HYPERLINK_DLG (HID_OFA_START + 12) -#define HID_OFA_MAILHEAD_ROLE_LB (HID_OFA_START + 13) -#define HID_OFA_MAILHEAD_RCPT_ED (HID_OFA_START + 14) -#define HID_OFA_MAILHEAD_RCPT_LB (HID_OFA_START + 15) -#define HID_OFA_MAILHEAD_SUBJECT_ED (HID_OFA_START + 16) -#define HID_OFA_MAILHEAD_RECEIPT_CB (HID_OFA_START + 17) -#define HID_OFA_MAILHEAD_PRIORITY_LB (HID_OFA_START + 18) -#define HID_OFA_MAILHEAD_HEAD_WIN (HID_OFA_START + 19) -#define HID_OFA_MAILATTACH_ATTACH_LB (HID_OFA_START + 20) -#define HID_OFA_MAILATTACH_ASCII_CB (HID_OFA_START + 21) -#define HID_OFA_MAILATTACH_HTML_CB (HID_OFA_START + 22) -#define HID_OFA_MAILATTACH_RTF_CB (HID_OFA_START + 23) -#define HID_OFA_MAILATTACH_OFFICE_CB (HID_OFA_START + 24) -#define HID_OFA_HYPERLINK_TARGET (HID_OFA_START + 25) -#define HID_OFA_HYPERLINK_SEARCH (HID_OFA_START + 26) -#define HID_OFA_MAILTOOLBOX (HID_OFA_START + 27) -#define HID_OFAPAGE_AUTOCORR_QUOTE (HID_OFA_START + 28) -#define HID_OFA_TP_VIEW (HID_OFA_START + 29) -#define HID_OFA_MAILMENU_OPEN (HID_OFA_START + 30) -#define HID_OFA_MAILMENU_DELETE (HID_OFA_START + 31) -#define HID_OFA_MAILMENU_RENAME (HID_OFA_START + 32) -#define HID_OFA_MAILMENU_SAVEAS (HID_OFA_START + 33) -#define HID_OFA_MAILMENU_ADDADDRESS (HID_OFA_START + 34) -#define HID_OFA_MAILMENU_COPYLINK (HID_OFA_START + 35) -#define HID_OFA_MAILMENU_SIG1 (HID_OFA_START + 36) -#define HID_OFA_MAILMENU_SIG2 (HID_OFA_START + 37) -#define HID_OFA_MAILMENU_SIG3 (HID_OFA_START + 38) -#define HID_OFA_MAILMENU_SIG4 (HID_OFA_START + 39) -#define HID_OFA_MAILHEAD_PROTOCOL_LB (HID_OFA_START + 42) -#define HID_OFA_MAILATTACH_RECEIPT_CB (HID_OFA_START + 43) -#define HID_OFA_MAILATTACH_PRIORITY_LB (HID_OFA_START + 44) -#define HID_OFA_MAILATTACH_TABBAR (HID_OFA_START + 45) -#define HID_OFAPAGE_AUTOCORR_CLB (HID_OFA_START + 46) -#define HID_OFAPAGE_AUTOFORMAT_CLB (HID_OFA_START + 47) -#define HID_OFAPAGE_AUTOFMT_OPTIONS (HID_OFA_START + 48) -#define HID_OFA_DLGFORMNEW (HID_OFA_START + 49) -#define HID_OFA_TP_APPEARANCE (HID_OFA_START + 50) -#define HID_OFA_HYPERLINK_NAME (HID_OFA_START + 51) -#define HID_OFA_HYPERLINK_URL_TXT (HID_OFA_START + 52) -#define HID_OFA_HYPERLINK_URL (HID_OFA_START + 53) -#define HID_OFA_MAILMENU_FILE (HID_OFA_START + 54) -#define HID_OFA_FONT_SUBSTITUTION (HID_OFA_START + 55) -#define HID_OFA_FONT_SUBST_CLB (HID_OFA_START + 56) -#define HID_OFA_SUBST_APPLY (HID_OFA_START + 57) -#define HID_OFA_SUBST_DELETE (HID_OFA_START + 58) -#define HID_OFADLG_REGISTRATION (HID_OFA_START + 59) -#define HID_OFA_TP_DESKTOP (HID_OFA_START + 60) -#define HID_REGISTRATION_REGISTER (HID_OFA_START + 61) -#define HID_REGISTRATION_ENABLE_KEY (HID_OFA_START + 62) -#define HID_AUTOCORR_LANGUAGE (HID_OFA_START + 63) -#define HID_OFA_MAILHEAD_RCPT_CB (HID_OFA_START + 64) -#define HID_OFA_SENDMENU_PLAIN (HID_OFA_START + 65) -#define HID_OFA_SENDMENU_ENCRYPT (HID_OFA_START + 66) -#define HID_OFA_SENDMENU_SIGN (HID_OFA_START + 67) -#define HID_OFA_SENDMENU_SIGNANDENCRYPT (HID_OFA_START + 68) -#define HID_OFADLG_OPTIONS_TREE (HID_OFA_START + 69) -#define HID_OFADLG_TREELISTBOX (HID_OFA_START + 70) -#define HID_OFADLG_TREE_GENERAL (HID_OFA_START + 71) -#define HID_OFADLG_TREE_INTERNET (HID_OFA_START + 72) -#define HID_OFADLG_TREE_BROWSER (HID_OFA_START + 73) -#define HID_OFADLG_TREE_TEXT (HID_OFA_START + 74) -#define HID_OFADLG_TREE_HTML (HID_OFA_START + 75) -#define HID_OFADLG_TREE_CALC (HID_OFA_START + 76) -#define HID_OFADLG_TREE_PRESENTATION (HID_OFA_START + 77) -#define HID_OFADLG_TREE_DRAWING (HID_OFA_START + 78) -#define HID_OFADLG_TREE_IMAGE (HID_OFA_START + 79) -#define HID_OFADLG_TREE_FORMULA (HID_OFA_START + 80) -#define HID_OFAPAGE_AUTOCOMPLETE_OPTIONS (HID_OFA_START + 113) -#define HID_OFADLG_TREE_CHART (HID_OFA_START + 115) -#define HID_OFADLG_TREE_BASE (HID_OFA_START + 116) -#define HID_OFADLG_TREE_FILTER (HID_OFA_START + 117) -#define HID_OFAPAGE_MSFLTR2_CLB (HID_OFA_START + 118) -#define HID_OFA_TP_LANGUAGES (HID_OFA_START + 119) -#define HID_OFADLG_TREE_LANGUAGE (HID_OFA_START + 120) -#define HID_OFA_CONNPOOL_DRIVERLIST (HID_OFA_START + 121) -#define UID_OFA_CONNPOOL_DRIVERLIST_BACK (HID_OFA_START + 122) -#define HID_OFA_TP_HELPERPROG (HID_OFA_START + 123) -#define HID_OFA_TP_MEMORY (HID_OFA_START + 124) -*/ // "Uberlaufkontrolle der HID's #define ACT_HID_END HID_OFA_TP_MEMORY #if ACT_HID_END > HID_OFA_END diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index ece258ba80df..7172770a5487 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -40,7 +40,6 @@ #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) @@ -110,7 +109,6 @@ #define ERR_CLPBRD_WRITE (RC_GLOBALS_BEGIN + 2) #define MSG_ERROR_PASSWD (RC_GLOBALS_BEGIN + 3) - // ACC --------------------------------------------------------------- #define FN_CHAR_LEFT_SEL (RC_GLOBALS_BEGIN + 1) // @@ -197,8 +195,6 @@ #define DLG_FRM_GRF (RC_GLOBALS_BEGIN + 37) #define DLG_FRM_OLE (RC_GLOBALS_BEGIN + 38) -#define RID_INPUT_TOOLBOX (RC_GLOBALS_BEGIN + 39) - #define TP_MACRO_ASSIGN (RC_GLOBALS_BEGIN + 40) #define TP_FRM_URL (RC_GLOBALS_BEGIN + 42) #define TP_CHAR_URL (RC_GLOBALS_BEGIN + 43) diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc index c9af820ba35b..a2788ced07b8 100644 --- a/sw/source/ui/inc/ribbar.hrc +++ b/sw/source/ui/inc/ribbar.hrc @@ -65,13 +65,10 @@ #define RID_ALIGNMENT_WIN (RC_RIBBAR_BEGIN + 20) //Resourcen fuer Inputwin (Rechenleiste) -#define RID_WIN_FORMULA (RC_RIBBAR_BEGIN + 21) #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_BEZIER_WIN (RC_RIBBAR_BEGIN + 28) -#define RID_SCROLL_NAVI_TBX (RC_RIBBAR_BEGIN + 29) #define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30) #define RID_PVIEW_ZOOM_LB (RC_RIBBAR_BEGIN + 31) |