diff options
-rw-r--r-- | chart2/source/controller/dialogs/CommonResources.hrc | 48 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/dlg_ChartType.cxx | 1 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/dlg_ChartType.hrc | 29 | ||||
-rw-r--r-- | cui/source/customize/acccfg.hrc | 22 | ||||
-rw-r--r-- | cui/source/customize/cfg.hrc | 30 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.hrc | 40 | ||||
-rw-r--r-- | sc/source/ui/inc/acredlin.hrc | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/solveroptions.hrc | 38 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solveroptions.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotations.hrc | 7 | ||||
-rw-r--r-- | sfx2/source/menu/menu.hrc | 12 | ||||
-rw-r--r-- | uui/source/secmacrowarnings.hrc | 6 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/dialogs.hrc | 22 |
13 files changed, 3 insertions, 257 deletions
diff --git a/chart2/source/controller/dialogs/CommonResources.hrc b/chart2/source/controller/dialogs/CommonResources.hrc deleted file mode 100644 index 3f0667d82818..000000000000 --- a/chart2/source/controller/dialogs/CommonResources.hrc +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ -#ifndef _CHART2_RESOURCE_HXX -#define _CHART2_RESOURCE_HXX - -#define BUTTONS_OK_CANCEL_HELP( xPos, yPos, xOffset, yOffset ) \ -OKButton BTN_OK \ -{ \ - Pos = MAP_APPFONT ( xPos , yPos ) ; \ - Size = MAP_APPFONT ( 50 , 14 ) ; \ - TabStop = TRUE ; \ - DefButton = TRUE ; \ -}; \ -CancelButton BTN_CANCEL \ -{ \ - Pos = MAP_APPFONT ( xPos+xOffset , yPos+yOffset ) ; \ - Size = MAP_APPFONT ( 50 , 14 ) ; \ - TabStop = TRUE ; \ -}; \ -HelpButton BTN_HELP \ -{ \ - Pos = MAP_APPFONT ( xPos+xOffset+xOffset , yPos+yOffset+yOffset ) ; \ - Size = MAP_APPFONT ( 50 , 14 ) ; \ - TabStop = TRUE ; \ -}; - -#define BUTTONS_OK_CANCEL_HELP_STACKED( xPos ) \ -BUTTONS_OK_CANCEL_HELP( xPos, 6, 0, 17 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 657225f0f7bd..49620c783c9d 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -18,7 +18,6 @@ */ #include "dlg_ChartType.hxx" -#include "dlg_ChartType.hrc" #include "ResId.hxx" #include "ResourceIds.hrc" #include "Strings.hrc" diff --git a/chart2/source/controller/dialogs/dlg_ChartType.hrc b/chart2/source/controller/dialogs/dlg_ChartType.hrc deleted file mode 100644 index e66a515670f8..000000000000 --- a/chart2/source/controller/dialogs/dlg_ChartType.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 "ResourceIds.hrc" - -#define TABCTRL 1 - -#define FL_BUTTONS 1 - -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/acccfg.hrc b/cui/source/customize/acccfg.hrc index 3abc97b5b341..19a5459f3c1f 100644 --- a/cui/source/customize/acccfg.hrc +++ b/cui/source/customize/acccfg.hrc @@ -17,30 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define GRP_FUNCTIONS 22 -#define BTN_ACC_CHANGE 3 -#define BTN_ACC_REMOVE 4 -#define BOX_ACC_ENTRIES 5 -#define GRP_ACC_KEYBOARD 8 -#define TXT_ACC_GROUP 9 -#define BOX_ACC_GROUP 10 -#define TXT_ACC_FUNCTION 11 -#define BOX_ACC_FUNCTION 12 -#define TXT_ACC_KEY 13 -#define BOX_ACC_KEY 14 -#define GRP_ACC_FUNCTIONS 15 -#define BTN_RESET 20 -#define BTN_LOAD 40 -#define BTN_SAVE 41 -#define RB_OFFICE 44 -#define RB_MODULE 45 - #define STR_GROUP_STYLES 58 #define STR_PDF_EXPORT_SEND 59 -#define IMG_INFO 61 - // FREE + #define BMP_COLLAPSED 63 #define BMP_EXPANDED 64 + #define STR_BASICMACROS 67 #define STR_HUMAN_APPNAME 69 #define STR_FILTERNAME_CFG 70 diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc index 593cbe52aa40..3c8d9d5202d3 100644 --- a/cui/source/customize/cfg.hrc +++ b/cui/source/customize/cfg.hrc @@ -19,25 +19,6 @@ #define CFG_OFFSET 300 -#define GRP_MENUS (9 + CFG_OFFSET) -#define FT_MENUS (10 + CFG_OFFSET) -#define LB_MENUS (11 + CFG_OFFSET) -#define BTN_NEW (12 + CFG_OFFSET) -#define BTN_CHANGE (14 + CFG_OFFSET) -#define GRP_MENU_SEPARATOR (15 + CFG_OFFSET) -#define GRP_MENU_ENTRIES (16 + CFG_OFFSET) -#define BOX_ENTRIES (17 + CFG_OFFSET) -#define BTN_CHANGE_ENTRY (18 + CFG_OFFSET) -#define BTN_UP (19 + CFG_OFFSET) -#define BTN_DOWN (20 + CFG_OFFSET) -#define FT_DESCRIPTION (22 + CFG_OFFSET) -#define TXT_SAVEIN (23 + CFG_OFFSET) -#define LB_SAVEIN (24 + CFG_OFFSET) -#define ED_DESCRIPTION (25 + CFG_OFFSET) -#define BTN_ADD_COMMANDS (26 + CFG_OFFSET) - -#define MODIFY_MENU (40 + CFG_OFFSET) -#define MODIFY_ENTRY (41 + CFG_OFFSET) #define ID_RENAME (42 + CFG_OFFSET) #define ID_MOVE (43 + CFG_OFFSET) #define ID_DELETE (44 + CFG_OFFSET) @@ -62,16 +43,6 @@ #define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET) #define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET) -#define TXT_MENU (80 + CFG_OFFSET) -#define BOX_MAIN_MENUS (81 + CFG_OFFSET) -#define BTN_MENU_UP (82 + CFG_OFFSET) -#define BTN_MENU_DOWN (83 + CFG_OFFSET) -#define BTN_MENU_ADD (84 + CFG_OFFSET) -#define BTN_MENU_CLOSE (85 + CFG_OFFSET) -#define BTN_MENU_HELP (86 + CFG_OFFSET) -#define TXT_MENU_NAME (87 + CFG_OFFSET) -#define EDIT_MENU_NAME (88 + CFG_OFFSET) - #define MD_ICONSELECTOR (90 + CFG_OFFSET) #define FT_SYMBOLS (91 + CFG_OFFSET) #define TB_SYMBOLS (92 + CFG_OFFSET) @@ -85,7 +56,6 @@ #define FL_SEPARATOR (108 + CFG_OFFSET) #define BTN_DELETE (109 + CFG_OFFSET) -//added for issue83555 #define MD_ICONCHANGE (119 + CFG_OFFSET) #define FTCHGE_DESCRIPTION (120 + CFG_OFFSET) #define EDT_ADDR (121 + CFG_OFFSET) diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc index b192541ab5c4..bbec93ad414e 100644 --- a/cui/source/dialogs/hangulhanjadlg.hrc +++ b/cui/source/dialogs/hangulhanjadlg.hrc @@ -65,54 +65,14 @@ #define FT_SUGGESTION 22 - // Hangul / Hanja Options Dialog -#define FT_USERDEFDICT 1 #define BTN_OPTIONS 10 -#define LB_DICTS 1 - -#define CB_IGNOREPOST 1 -#define CB_SHOWRECENTLYFIRST 3 -#define CB_AUTOREPLACEUNIQUE 4 - -#define PB_HHO_NEW 1 -#define PB_HHO_EDIT 2 -#define PB_HHO_DELETE 3 -#define PB_HHO_OK 4 -#define PB_HHO_CANCEL 5 -#define PB_HHO_HELP 6 - // metrics #define HHO_DLGWIDTH 287 #define HHx_DLGHIGHT 175 -#define HHO_COL_1 RSC_SP_DLG_INNERBORDER_LEFT -#define HHO_COL_1a (HHO_COL_1+3) -#define HHO_COL_6 (HHO_DLGWIDTH-6) -#define HHO_COL_5 (HHO_COL_6-50) -#define HHO_COL_4 (HHO_COL_5-12) -#define HHO_COL_3 (HHO_COL_4-50) -#define HHO_COL_2 (HHO_COL_3-6) - -#define HHO_ROW_1 RSC_SP_DLG_INNERBORDER_TOP -#define HHO_ROW_2 (HHO_ROW_1+8+2) -#define HHO_ROW_3 (HHO_ROW_2+14) -#define HHO_ROW_4 (HHO_ROW_3+2) -#define HHO_ROW_5 (HHO_ROW_4+14) -#define HHO_ROW_6 (HHO_ROW_5+2) -#define HHO_ROW_7 (HHO_ROW_6+14) -#define HHO_ROW_8 (HHO_ROW_7+4) -#define HHO_ROW_9 (HHO_ROW_8+8+4) -#define HHO_ROW_11 (HHO_ROW_9+8+4) -#define HHO_ROW_12 (HHO_ROW_11+8+4) - -#define HHO_ROW_a1 HHO_ROW_1 -#define HHO_ROW_a2 (HHO_ROW_a1+14) -#define HHO_ROW_a3 (HHO_ROW_a2+2) -#define HHO_ROW_a4 (HHO_ROW_a3+14) -#define HHO_ROW_a5 (HHO_ROW_a4+4) // Hangul Hanja Edit Custom Dictionary Dialog #define MAXNUM_SUGGESTIONS 50 diff --git a/sc/source/ui/inc/acredlin.hrc b/sc/source/ui/inc/acredlin.hrc index 29c5c93b6163..d84409550523 100644 --- a/sc/source/ui/inc/acredlin.hrc +++ b/sc/source/ui/inc/acredlin.hrc @@ -19,10 +19,6 @@ #include "sc.hrc" -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 5 - #define SC_CHANGES_COMMENT 49 #define SC_SUB_SORT 50 #define SC_SORT_ACTION 51 diff --git a/sc/source/ui/inc/solveroptions.hrc b/sc/source/ui/inc/solveroptions.hrc deleted file mode 100644 index 121beaf46975..000000000000 --- a/sc/source/ui/inc/solveroptions.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 "sc.hrc" - -#define FT_ENGINE 1 -#define FT_SETTINGS 2 -#define FT_OPTIONNAME 3 - -#define LB_ENGINE 1 -#define LB_SETTINGS 2 - -#define FL_BUTTONS 1 - -#define BTN_EDIT 1 -#define BTN_HELP 2 -#define BTN_OK 3 -#define BTN_CANCEL 4 - -#define NF_VALUE 1 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index cabc77454d9c..d31634370481 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -18,7 +18,6 @@ */ #include "solveroptions.hxx" -#include "solveroptions.hrc" #include "scresid.hxx" #include "global.hxx" #include "miscuno.hxx" diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc index f4a9e73cdc2f..685664f07b7b 100644 --- a/sd/source/ui/annotations/annotations.hrc +++ b/sd/source/ui/annotations/annotations.hrc @@ -41,13 +41,6 @@ #define RID_ANNOTATION_CONTEXTMENU (RID_ANNOTATIONS_START+0) #define RID_ANNOTATION_TAG_CONTEXTMENU (RID_ANNOTATIONS_START+1) -#define BTN_NEW 1 -#define BTN_DELETE 2 -#define BTN_NEXT 3 -#define BTN_PREV 4 - -#define FT_AUTHOR 1 - #endif // _SD_ANNOTATIONPANE_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/menu/menu.hrc b/sfx2/source/menu/menu.hrc index 94adf5fb128c..19f787e2a2b3 100644 --- a/sfx2/source/menu/menu.hrc +++ b/sfx2/source/menu/menu.hrc @@ -24,18 +24,6 @@ #define IBX_MNUCFG_ALREADY_INCLUDED (RID_SFX_MENU_START+2) -#define BTN_UP 3 -#define BTN_LEFT 4 -#define BTN_RIGHT 5 -#define BTN_DOWN 6 -#define BTN_NEW 7 -#define BTN_CHANGE 8 -#define BTN_REMOVE 9 -#define BOX_ENTRIES 10 -#define TXT_TEXT 11 -#define EDT_TEXT 12 -#define GRP_FUNCTIONS 22 - #define STR_MENU_CFGITEM RID_SFX_MENU_START+1 #define STR_MENU_ADDONS RID_SFX_MENU_START+2 #define STR_MENU_ADDONHELP RID_SFX_MENU_START+3 diff --git a/uui/source/secmacrowarnings.hrc b/uui/source/secmacrowarnings.hrc index a8f9750ae4d8..7f7e9aec90f3 100644 --- a/uui/source/secmacrowarnings.hrc +++ b/uui/source/secmacrowarnings.hrc @@ -24,12 +24,6 @@ // --------- general metrics --------- -#define SEP_FL_SPACE_Y 6 -#define SEP_FL_ADJ_Y(val) (val-3) -#define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM) -#define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT) -#define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5) -#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3) #define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH) #define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH) #define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH) diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc index 0b3f0dda0cc4..858e98021cfa 100644 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ b/xmlsecurity/source/dialogs/dialogs.hrc @@ -27,10 +27,8 @@ #define FL_BOTTOM_SEP 50 #define BTN_HELP 53 -#define LB_SIGNATURES 54 -#define BTN_VIEWCERT 55 + #define STR_HEADERBAR 56 -#define BTN_RESET 57 #define STR_VALID_SIGNATURE 58 #define STR_NO_INFO_TO_VERIFY 59 #define STR_INVALID_SIGNATURE 60 @@ -41,20 +39,14 @@ // --------- ... for tab dialogs ----- #define TP_WIDTH 260 #define TP_HEIGHT 185 -#define RIDDER_HEIGHT (RSC_CD_PUSHBUTTON_HEIGHT) #define TD_SP_INNERBORDER_LEFT 3 #define TD_SP_INNERBORDER_RIGHT 3 -#define TD_SP_INNERBORDER_TOP 3 -#define TD_SP_INNERBORDER_BOTTOM 3 #define TD_WIDTH (TP_WIDTH+RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT) -#define TD_HEIGHT (TP_HEIGHT+TD_SP_INNERBORDER_TOP+2*TD_SP_INNERBORDER_BOTTOM+RSC_CD_PUSHBUTTON_HEIGHT+RIDDER_HEIGHT) #define SEP_FL_SPACE_Y 6 -#define SEP_FL_ADJ_Y(val) (val-3) #define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM) #define DLGS_BOTTOM_BTN_Y(dlgh) (DLGS_BOTTOM_BTN_L(dlgh)-RSC_CD_PUSHBUTTON_HEIGHT) #define DLGS_BOTTOM_FL_Y(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-SEP_FL_SPACE_Y-5) -#define DLGS_BOTTOM_LAST_CTRL_L(dlgh) (DLGS_BOTTOM_BTN_Y(dlgh)-2*SEP_FL_SPACE_Y-3) #define DLGS_BOTTOM_HELP_X(dlgw) (dlgw-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH) #define DLGS_BOTTOM_CANCEL_X(dlgw) (DLGS_BOTTOM_HELP_X(dlgw)-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH) #define DLGS_BOTTOM_OK_X(dlgw) (DLGS_BOTTOM_CANCEL_X(dlgw)-RSC_SP_CTRL_DESC_X-RSC_CD_PUSHBUTTON_WIDTH) @@ -80,9 +72,6 @@ #define CV_COL_B (CV_COL_C-RSC_SP_CTRL_X) #define CV_COL_A (CV_COL_B-RSC_CD_PUSHBUTTON_WIDTH) -#define CV_ROW_B (TD_HEIGHT-TD_SP_INNERBORDER_BOTTOM) -#define CV_ROW_A (CV_ROW_B-RSC_CD_PUSHBUTTON_HEIGHT) - // --------- tab page Certificate viewer - General --------- #define WIN_FRAME 2 #define IMG_CERT 3 @@ -147,21 +136,12 @@ // --------- tab page Certificate viewer - Certification Path --------- -#define FT_CERTPATH 1 -#define FT_CERTSTATUS 2 -#define ML_CERTSTATUS 3 -#define IMG_CERT_SMALL 4 -#define IMG_CERT_NOTVALIDATED_SMALL 6 #define STR_PATH_CERT_OK 8 #define STR_PATH_CERT_NOT_VALIDATED 9 #define CVP_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP #define CVP_ROW_1 (CVP_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) #define REST_HEIGHT (TP_HEIGHT-CVP_ROW_1-2*RSC_SP_GRP_SPACE_Y-RSC_CD_FIXEDTEXT_HEIGHT-RSC_CD_PUSHBUTTON_HEIGHT) -#define CVP_ROW_2 (CVP_ROW_1+REST_HEIGHT/3*2+RSC_SP_CTRL_DESC_Y) -#define CVP_ROW_3 (CVP_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT) -#define CVP_ROW_4 (CVP_ROW_3+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) - // --------- tab dialog macro security --------- |