diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-04-23 18:19:37 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-04-23 22:49:57 +0000 |
| commit | 702f9c5176eebb95c5a1bfd31c1f256b79301b19 (patch) | |
| tree | 2aedc04b1af4e2f36b0da9fd5b06570faa3eef40 /xmlsecurity | |
| parent | 513a21aa6cf350c094289a7976de9e0cc0e7b4d4 (diff) | |
huge hrc and src file cleanup
* mostly fallout from ui conversion
* some completely unused defines from src files
* lots of unused HID ids
Change-Id: I976561205798db3d06ee139de6223f638e58f47a
Reviewed-on: https://gerrit.libreoffice.org/9142
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/dialogs.hrc | 29 | ||||
| -rw-r--r-- | xmlsecurity/source/dialogs/helpids.hrc | 4 |
2 files changed, 2 insertions, 31 deletions
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc b/xmlsecurity/source/dialogs/dialogs.hrc index 858e98021cfa..d50d8d52c041 100644 --- a/xmlsecurity/source/dialogs/dialogs.hrc +++ b/xmlsecurity/source/dialogs/dialogs.hrc @@ -40,8 +40,6 @@ #define TP_WIDTH 260 #define TP_HEIGHT 185 #define TD_SP_INNERBORDER_LEFT 3 -#define TD_SP_INNERBORDER_RIGHT 3 -#define TD_WIDTH (TP_WIDTH+RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_DLG_INNERBORDER_RIGHT) #define SEP_FL_SPACE_Y 6 #define DLGS_BOTTOM_BTN_L(dlgh) (dlgh-RSC_SP_DLG_INNERBORDER_BOTTOM) @@ -67,11 +65,6 @@ #define CV_ROW_1 (CV_ROW_0+2*CV_CONT_HEIGHT/3) #define CV_ROW_2 (CV_ROW_1+RSC_SP_CTRL_GROUP_Y) -#define CV_COL_D (TD_WIDTH-TD_SP_INNERBORDER_RIGHT) -#define CV_COL_C (CV_COL_D-RSC_CD_PUSHBUTTON_WIDTH) -#define CV_COL_B (CV_COL_C-RSC_SP_CTRL_X) -#define CV_COL_A (CV_COL_B-RSC_CD_PUSHBUTTON_WIDTH) - // --------- tab page Certificate viewer - General --------- #define WIN_FRAME 2 #define IMG_CERT 3 @@ -139,21 +132,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) - -// --------- tab dialog macro security --------- - -#define MS_COL_A (TD_WIDTH-RSC_SP_DLG_INNERBORDER_LEFT) -#define MS_COL_B (MS_COL_A-RSC_CD_PUSHBUTTON_WIDTH) -#define MS_COL_C (MS_COL_B-RSC_SP_CTRL_X) -#define MS_COL_D (MS_COL_C-RSC_CD_PUSHBUTTON_WIDTH) -#define MS_COL_E (MS_COL_D-RSC_SP_CTRL_X) -#define MS_COL_F (MS_COL_E-RSC_CD_PUSHBUTTON_WIDTH) -#define MS_COL_G (MS_COL_F-RSC_SP_CTRL_X) -#define MS_COL_H (MS_COL_G-RSC_CD_PUSHBUTTON_WIDTH) - // --------- signed macro warning --------- #define FI_DOCNAME 1 @@ -176,14 +154,11 @@ #define MW_COL_4 (MW_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) #define MW_COL_3 (MW_COL_4-RSC_CD_PUSHBUTTON_WIDTH) #define MW_COL_2 (MW_COL_3-RSC_SP_CTRL_DESC_X) -#define MW_COL_A (DLGS_BOTTOM_OK_X(MW_WIDTH)) -#define MW_COL_C (DLGS_BOTTOM_CANCEL_X(MW_WIDTH)) -#define MW_COL_E (DLGS_BOTTOM_HELP_X(MW_WIDTH)) + #define MW_ROW_0 (RSC_SP_DLG_INNERBORDER_TOP) #define MW_ROW_1 (MW_ROW_0+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y) #define MW_ROW_2 (MW_ROW_1+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y) -#define MW_ROW_7 (MW_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM) -#define MW_ROW_6 (DLGS_BOTTOM_BTN_Y(MW_HEIGHT)) + #define MW_ROW_5 (DLGS_BOTTOM_FL_Y(MW_HEIGHT)) #define MW_ROW_4 (MW_ROW_5-RSC_CD_CHECKBOX_HEIGHT-RSC_SP_CTRL_Y) #define MW_ROW_3 (MW_ROW_4-4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y) diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc index 6c49231ab3c0..0972ac444f05 100644 --- a/xmlsecurity/source/dialogs/helpids.hrc +++ b/xmlsecurity/source/dialogs/helpids.hrc @@ -22,14 +22,10 @@ #include <svl/solar.hrc> -// Help-Ids -------------------------------------------------------------- - #define HID_XMLSEC_TP_GENERAL "XMLSECURITY_HID_XMLSEC_TP_GENERAL" #define HID_XMLSEC_TP_DETAILS "XMLSECURITY_HID_XMLSEC_TP_DETAILS" #define HID_XMLSEC_TP_MACROWARN "XMLSECURITY_HID_XMLSEC_TP_MACROWARN" #define HID_XMLSEC_CTRL_ELEMENTS "XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS" -#define HID_XMLSEC_CTRL_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG" -#define HID_XMLSEC_CTRL_CHOOSESIGNATURES "XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES" #define HID_XMLSEC_TREE_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_TREE_SIGNATURESDLG" #endif // #ifndef _XMLSEC_HELPIDS_HRC |