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 /include/sfx2 | |
| 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 'include/sfx2')
| -rw-r--r-- | include/sfx2/sfx.hrc | 16 | ||||
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 5 | ||||
| -rw-r--r-- | include/sfx2/sidebar/ResourceDefinitions.hrc | 70 |
3 files changed, 1 insertions, 90 deletions
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 5a21d82d09b7..b8ccfa44f362 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -252,18 +252,6 @@ #define MID_DOCINFO_DELETEUSERDATA 0x32 // only for FastPropertySet -#define MID_DOCINFO_REVISION 0x15 -#define MID_DOCINFO_EDITTIME 0x16 -#define MID_DOCINFO_MODIFICATIONAUTHOR 0x18 -#define MID_DOCINFO_TEMPLATE 0x1c -#define MID_DOCINFO_PRINTDATE 0x28 -#define MID_DOCINFO_PRINTEDBY 0x2a -#define MID_DOCINFO_TEMPLATEDATE 0x2b -#define MID_DOCINFO_STATISTIC 0x33 -#define MID_DOCINFO_CHARLOCALE 0x34 -#define MID_CATEGORY 0x35 -#define MID_COMPANY 0x36 -#define MID_MANAGER 0x37 #define MID_TYPE 0x38 #define MID_VALUE 0x39 #define MID_VALUESET 0x40 @@ -285,10 +273,6 @@ #include <sfx2/sfxsids.hrc> -#define HID_INTERFACE_SFXHELP_VIEWSH 24 - #endif // #ifndef _SFX_HRC -// ******************************************************************* EOF - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 8144a574bc88..b9daddff9ccb 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -302,7 +302,6 @@ #define SID_ACTIVATE (SID_SFX_START + 525) #define SID_PRINTOUT (SID_SFX_START + 526) -#define SID_FILE_LONGNAME (SID_SFX_START + 529) #define SID_FILTER_NAME (SID_SFX_START + 530) #define SID_DOC_SALVAGE (SID_SFX_START + 531) #define SID_INSERTDOC (SID_SFX_START + 532) @@ -370,7 +369,6 @@ #define SID_STYLE_REFERENCE (SID_SFX_START + 1602) #define SID_TEMPLATE_NAME (SID_SFX_START + 660) -#define SID_TEMPLATE_REGION (SID_SFX_START + 661) #define SID_TEMPLATE_REGIONNAME (SID_SFX_START + 662) #define SID_TEMPLATE_LOAD (SID_SFX_START + 663) @@ -675,7 +673,6 @@ #define SID_BASICIDE_ARG_DOCUMENT_MODEL ( SID_BASICIDE_START + 51 ) #define SID_BASICIDE_MANAGE_LANG ( SID_BASICIDE_START + 52 ) #define SID_BASICIDE_CURRENT_LANG ( SID_BASICIDE_START + 53 ) -#define SID_BASICIDE_IDEOPTIONS ( SID_BASICIDE_START + 54 ) // SlotIds for Apps -------------------------------------------------------- #define FN_PARAM (SID_SW_START + 1100) @@ -759,6 +756,4 @@ #define FID_CHG_RECORD (EDIT_MENU_START + 18) #define SID_CHG_PROTECT (SC_VIEW_START + 84) -// eof ------------------------------------------------------------------------ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc index 7d7fd12dc8b7..13077f38b80a 100644 --- a/include/sfx2/sidebar/ResourceDefinitions.hrc +++ b/include/sfx2/sidebar/ResourceDefinitions.hrc @@ -21,33 +21,7 @@ #include <sfx2/sfx.hrc> -//section page RID -#define RC_PROPERTYPANEL_START RID_SFX_PROPERTYPANEL_START -#define DLG_PROPERTY_DOCKING_WINDOW ( RC_PROPERTYPANEL_START + 0 ) -#define BMP_PROPERTYPANEL_EXPAND ( RC_PROPERTYPANEL_START + 1 ) -#define BMP_PROPERTYPANEL_COLLAPSE ( RC_PROPERTYPANEL_START + 2 ) -#define BMP_PROPERTYPANEL_MOREPROPERTY ( RC_PROPERTYPANEL_START + 5 ) -#define FT_PROPERTYPANEL_NOTSUPPORT_DESC ( RC_PROPERTYPANEL_START + 7 ) - -#define RID_PROPERTYPANEL_TEXTPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 8 ) -#define RID_PROPERTYPANEL_PARAGRAPHPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 9 ) -#define RID_PROPERTYPANEL_AREAPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 10 ) -#define RID_PROPERTYPANEL_TBLDESIGNPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 11 ) -#define RID_PROPERTYPANEL_LINEPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 12 ) -#define RID_PROPERTYPANEL_POSIZEPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 13 ) -#define RID_PROPERTYPANEL_GRAPHICPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 14 ) -#define RID_PROPERTYPANEL_CELLAPPEARPAGE_TITLEBAR ( RC_PROPERTYPANEL_START + 15 ) -#define RID_PROPERTYPANEL_SWPAGE_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 16) -#define RID_PROPERTYPANEL_SWOBJWRAP_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 17) -#define RID_PROPERTYPANEL_SCCELL_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 18) -#define RID_PROPERTYPANEL_SCALIGNMENT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START + 19) -#define RID_PROPERTYPANEL_SD_PAGELAYOUT_TITLEBAR (RC_PROPERTYPANEL_START+20) -#define RID_PROPERTYPANEL_SD_PAGEPROPERTY_TITLEBAR (RC_PROPERTYPANEL_START+21) -#define RID_PROPERTYPANEL_SD_TABLEDESIGN_TITLEBAR (RC_PROPERTYPANEL_START+22) -#define RID_PROPERTYPANEL_NUMFORMAT_PAGE_TITLEBAR (RC_PROPERTYPANEL_START+23) - -#define RID_PANELDOCK_WINDOW ( RC_PROPERTYPANEL_START + 24 ) -#define STR_TITLE_DISCRIPTION ( RC_PROPERTYPANEL_START + 25 ) +#define STR_TITLE_DISCRIPTION ( RID_SFX_PROPERTYPANEL_START + 0 ) #ifndef STD_MASKCOLOR #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } @@ -58,30 +32,9 @@ #define PROPERTYPAGE_WIDTH 109 //about titlebar - -#define FI_EXPANSION_INDICATOR 1 -#define FT_TITLE 2 #define STR_MOREPROPERTY_QUICKHELP 3 -#define TITLEBAR_WIDTH PROPERTYPAGE_WIDTH -#define TITLEBAR_HEIGHT 13 - -#define TITLEBAR_MARGIN_HORIZONTAL 3 -#define TITLEBAR_CONTROL_SPACING_HORIZONTAL 3 - -#define FI_EXPANSION_INDICATOR_WIDTH 6 -#define FI_EXPANSION_INDICATOR_HEIGHT 6 -#define FI_EXPANSION_INDICATOR_X TITLEBAR_MARGIN_HORIZONTAL -#define FI_EXPANSION_INDICATOR_Y (TITLEBAR_HEIGHT - FI_EXPANSION_INDICATOR_HEIGHT)/2 - -#define FT_TITLE_WIDTH 85 -#define FT_TITLE_HEIGHT 10 -#define FT_TITLE_X FI_EXPANSION_INDICATOR_X + FI_EXPANSION_INDICATOR_WIDTH + TITLEBAR_CONTROL_SPACING_HORIZONTAL -#define FT_TITLE_Y (TITLEBAR_HEIGHT - FT_TITLE_HEIGHT)/2 + 1 - - //about section page -#define SECTIONPAGE_MARGIN_VERTICAL 12 #define SECTIONPAGE_MARGIN_VERTICAL_TOP 1 #define SECTIONPAGE_MARGIN_VERTICAL_BOT 5 #define SECTIONPAGE_MARGIN_HORIZONTAL 3 @@ -99,37 +52,16 @@ //for 16*16 pixel bmp #define TOOLBOX_ITEM_HEIGHT 15 #define TOOLBOX_ITEM_WIDTH 13 -#define TOOLBOX_ITEM_DD_WIDTH 19 - -//for 24*16 pixel bmp -#define TOOLBOX_24_16_ITEM_HEIGHT 15 -#define TOOLBOX_24_16_ITEM_DD_WIDTH 23 - -//for 24*24 pixel bmp -#define TOOLBOX_24_24_ITEM_HEIGHT 18 -#define TOOLBOX_24_24_ITEM_DD_WIDTH 24 //about popup panel #define POPUPPANEL_MARGIN_VERTICAL 7 #define POPUPPANEL_MARGIN_HORIZONTAL 7 -//for 42*42 pixel bmp -#define TOOLBOX_42_42_ITEM_HEIGHT 30 -#define TOOLBOX_42_42_ITEM_DD_WIDTH 27 -#define TB_BORDER 2 - -#define POPUPPANEL_SEP_VERTICAL_1 10 -#define POPUPPANEL_SEP_VERTICAL_2 6 -#define POPUPPANEL_SEP_HEIGHT 1 - #define POPUP_BORDER_WIDTH 2 #define POPUP_BORDER_HEIGHT 3 #define OFFSET_X 1 #define OFFSET_Y 1 -#define POPUP_TOP_GRADIENT_HEIGHT 4 -#define POPUP_BOT_GRADIENT_HEIGHT 6 - #define POPUP_COLOR_PICKER_WIDTH 97 #define POPUP_COLOR_PICKER_HEIGHT 114 //new |