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 /svx | |
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 'svx')
-rw-r--r-- | svx/inc/fmhelp.hrc | 16 | ||||
-rw-r--r-- | svx/inc/globlmn_tmpl.hrc | 6 | ||||
-rw-r--r-- | svx/inc/helpid.hrc | 115 | ||||
-rw-r--r-- | svx/source/dialog/ctredlin.cxx | 1 | ||||
-rw-r--r-- | svx/source/dialog/ctredlin.hrc | 23 | ||||
-rw-r--r-- | svx/source/dialog/docrecovery.hrc | 108 | ||||
-rw-r--r-- | svx/source/inc/datanavi.hrc | 8 | ||||
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.hrc | 1 | ||||
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.hrc | 6 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 144 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.src | 9 | ||||
-rw-r--r-- | svx/source/svdraw/svdstr.src | 13 |
12 files changed, 1 insertions, 449 deletions
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 71e5b07ed7fb..e09fe03a3ef3 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -19,28 +19,12 @@ #ifndef _SVX_FMHELP_HRC #define _SVX_FMHELP_HRC -// Help-Ids -------------------------------------------------------------- #define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" #define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" #define HID_FIELD_SEL "SVX_HID_FIELD_SEL" #define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN" #define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR" #define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN" -#define HID_FM_DLG_SEARCH "SVX_HID_FM_DLG_SEARCH" -#define HID_SEARCH_TEXT "SVX_HID_SEARCH_TEXT" -#define HID_SEARCH_ALLFIELDS "SVX_HID_SEARCH_ALLFIELDS" -#define HID_SEARCH_FIELDSELECTION "SVX_HID_SEARCH_FIELDSELECTION" -#define HID_SEARCH_POSITION "SVX_HID_SEARCH_POSITION" -#define HID_SEARCH_FORMATTER "SVX_HID_SEARCH_FORMATTER" -#define HID_SEARCH_CASE "SVX_HID_SEARCH_CASE" -#define HID_SEARCH_BACKWARD "SVX_HID_SEARCH_BACKWARD" -#define HID_SEARCH_STARTOVER "SVX_HID_SEARCH_STARTOVER" -#define HID_SEARCH_WILDCARD "SVX_HID_SEARCH_WILDCARD" -#define HID_SEARCH_REGULAR "SVX_HID_SEARCH_REGULAR" -#define HID_SEARCH_APPROX "SVX_HID_SEARCH_APPROX" -#define HID_SEARCH_APPROXSETTINGS "SVX_HID_SEARCH_APPROXSETTINGS" -#define HID_SEARCH_BTN_SEARCH "SVX_HID_SEARCH_BTN_SEARCH" -#define HID_SEARCH_BTN_CLOSE "SVX_HID_SEARCH_BTN_CLOSE" #define HID_CONTROLS_DATE_N_TIME "SVX_HID_CONTROLS_DATE_N_TIME" #define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST" #define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV" diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index cc0ab305b6d6..9ba061fcc8d8 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -439,12 +439,6 @@ Identifier = SID_OBJECT_ROTATE ; \ Command = ".uno:ToggleObjectRotateMode" ; \ -#define ITEM_FILE_BLUETOOTH_SENDDOC \ - Identifier = SID_BLUETOOTH_SENDDOC ; \ - Command = ".uno:SendViaBluetooth" ; \ - HelpID = SID_BLUETOOTH_SENDDOC ; \ - Text [ en-US ] = "Document via ~Bluetooth..." ; \ - #define ITEM_TRANSLITERATE_MENU\ MenuItem\ {\ diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index c868e8cdb363..53a78e81aa5a 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -23,7 +23,6 @@ #include <svx/svxcommands.h> #include <sfx2/sfxcommands.h> -// Help-Ids -------------------------------------------------------------- #define HID_BMPMASK_CTL_PIPETTE "SVX_HID_BMPMASK_CTL_PIPETTE" #define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1" #define HID_BMPMASK_TBI_PIPETTE "SVX_HID_BMPMASK_TBI_PIPETTE" @@ -56,7 +55,6 @@ #define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" #define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX" #define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX" -#define HID_FONTWORK_CTL_FORMS "SVX_HID_FONTWORK_CTL_FORMS" #define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE" #define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER" #define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT" @@ -72,19 +70,15 @@ #define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX" #define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY" #define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT" -// free #define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" #define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" #define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD" -#define HID_GALLERY_MN_ADDMENU "SVX_HID_GALLERY_MN_ADDMENU" -#define HID_GALLERY_MN_ADD_LINK "SVX_HID_GALLERY_MN_ADD_LINK" #define HID_GALLERY_MN_BACKGROUND "SVX_HID_GALLERY_MN_BACKGROUND" #define HID_GALLERY_MN_COPYCLIPBOARD "SVX_HID_GALLERY_MN_COPYCLIPBOARD" #define HID_GALLERY_MN_DELETE "SVX_HID_GALLERY_MN_DELETE" #define HID_GALLERY_MN_PASTECLIPBOARD "SVX_HID_GALLERY_MN_PASTECLIPBOARD" #define HID_GALLERY_MN_PREVIEW "SVX_HID_GALLERY_MN_PREVIEW" #define HID_GALLERY_NEWTHEME "SVX_HID_GALLERY_NEWTHEME" -#define HID_GALLERY_PREVIEW "SVX_HID_GALLERY_PREVIEW" #define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES" #define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME" #define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST" @@ -150,32 +144,18 @@ #define HID_POPUP_LINE "SVX_HID_POPUP_LINE" #define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND" #define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" -#define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL" #define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" #define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL" -#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER "SVX_HID_SVX_CHINESE_DICTIONARY_LB_HEADER" #define HID_SVX_MDLG_DOCRECOVERY_BROKEN "SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN" #define HID_SVX_MDLG_DOCRECOVERY_PROGR "SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR" -#define HID_SVX_MDLG_ERR_REP_OPTIONS "SVX_HID_SVX_MDLG_ERR_REP_OPTIONS" -#define HID_SVX_MDLG_ERR_REP_PREVIEW "SVX_HID_SVX_MDLG_ERR_REP_PREVIEW" #define HID_SVX_TABDLG_DOCRECOVERY "SVX_HID_SVX_TABDLG_DOCRECOVERY" #define HID_SVX_TP_DOCRECOVERY_RECOVER "SVX_HID_SVX_TP_DOCRECOVERY_RECOVER" #define HID_SVX_TP_DOCRECOVERY_SAVE "SVX_HID_SVX_TP_DOCRECOVERY_SAVE" -#define HID_SVX_TP_ERR_REP_SEND "SVX_HID_SVX_TP_ERR_REP_SEND" -#define HID_SVX_TP_ERR_REP_WELCOME "SVX_HID_SVX_TP_ERR_REP_WELCOME" #define HID_VALUESET_EXTRUSION_DIRECTION "SVX_HID_VALUESET_EXTRUSION_DIRECTION" #define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" #define HID_XMLSEC_CALL "SVX_HID_XMLSEC_CALL" -#define HID_CT_THES_ALTERNATIVES "SVX_HID_CT_THES_ALTERNATIVES" -#define HID_PROPERTYPANEL_SECTIONPAGE_BEGIN "SVX_HID_PROPERTYPANEL_SECTIONPAGE_BEGIN" -#define HID_PROPERTYPANEL_TEXT_SECTION "SVX_HID_PROPERTYPANEL_TEXT_SECTION" -#define HID_PROPERTYPANEL_PARA_SECTION "SVX_HID_PROPERTYPANEL_PARA_SECTION" -#define HID_PROPERTYPANEL_AREA_SECTION "SVX_HID_PROPERTYPANEL_AREA_SECTION" -#define HID_PROPERTYPANEL_LINE_SECTION "SVX_HID_PROPERTYPANEL_LINE_SECTION" -#define HID_PPROPERTYPANEL_AREA_LB_TRGR_TYPES "SVX_HID_PPROPERTYPANEL_AREA_LB_TRGR_TYPES" -#define HID_PPROPERTYPANEL_AREA_MTR_TRANSPARENT "SVX_HID_PPROPERTYPANEL_AREA_MTR_TRANSPARENT" #define HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES "SVX_HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES" #define HID_PPROPERTYPANEL_AREA_LB_FILL_ATTR "SVX_HID_PPROPERTYPANEL_AREA_LB_FILL_ATTR" #define HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_X "SVX_HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_X" @@ -186,110 +166,15 @@ #define HID_PPROPERTYPANEL_AREA_MTR_TRGR_BORDER "SVX_HID_PPROPERTYPANEL_AREA_MTR_TRGR_BORDER" #define HID_PPROPERTYPANEL_AREA_BTN_LEFT_SECOND "SVX_HID_PPROPERTYPANEL_AREA_BTN_LEFT_SECOND" #define HID_PPROPERTYPANEL_AREA_BTN_RIGHT_FIRST "SVX_HID_PPROPERTYPANEL_AREA_BTN_RIGHT_FIRST" -#define HID_PPROPERTYPANEL_TEXT_TBX_FONT "SVX_HID_PPROPERTYPANEL_TEXT_TBX_FONT" -#define HID_PPROPERTYPANEL_TEXT_TBI_BOLD "SVX_HID_PPROPERTYPANEL_TEXT_TBI_BOLD" -#define HID_PPROPERTYPANEL_TEXT_TBI_ITALIC "SVX_HID_PPROPERTYPANEL_TEXT_TBI_ITALIC" -#define HID_PPROPERTYPANEL_TEXT_TBI_UNDERLINE "SVX_HID_PPROPERTYPANEL_TEXT_TBI_UNDERLINE" -#define HID_PPROPERTYPANEL_TEXT_TBI_STRIKEOUT "SVX_HID_PPROPERTYPANEL_TEXT_TBI_STRIKEOUT" -#define HID_PPROPERTYPANEL_TEXT_TBI_SHADOWED "SVX_HID_PPROPERTYPANEL_TEXT_TBI_SHADOWED" -#define HID_PPROPERTYPANEL_TEXT_TBX_FONTSIZE_INDE "SVX_HID_PPROPERTYPANEL_TEXT_TBX_FONTSIZE_INDE" -#define HID_PPROPERTYPANEL_TEXT_TBI_INCREASE "SVX_HID_PPROPERTYPANEL_TEXT_TBI_INCREASE" -#define HID_PPROPERTYPANEL_TEXT_TBI_DECREASE "SVX_HID_PPROPERTYPANEL_TEXT_TBI_DECREASE" -#define HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR "SVX_HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR" -#define HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR "SVX_HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR" -#define HID_PPROPERTYPANEL_TEXT_TBX_HIGHLIGHT_COLOR "SVX_HID_PPROPERTYPANEL_TEXT_TBX_HIGHLIGHT_COLOR" -#define HID_PPROPERTYPANEL_TEXT_TBI_HIGHLIGHT_COLOR "SVX_HID_PPROPERTYPANEL_TEXT_TBI_HIGHLIGHT_COLOR" -#define HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT_SW "SVX_HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT_SW" -#define HID_PPROPERTYPANEL_TEXT_TBI_SUPER_SW "SVX_HID_PPROPERTYPANEL_TEXT_TBI_SUPER_SW" -#define HID_PPROPERTYPANEL_TEXT_TBI_SUB_SW "SVX_HID_PPROPERTYPANEL_TEXT_TBI_SUB_SW" -#define HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT "SVX_HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT" -#define HID_PPROPERTYPANEL_TEXT_TBI_SUPER "SVX_HID_PPROPERTYPANEL_TEXT_TBI_SUPER" -#define HID_PPROPERTYPANEL_TEXT_TBI_SUB "SVX_HID_PPROPERTYPANEL_TEXT_TBI_SUB" #define HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS "SVX_HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS" -#define HID_PPROPERTYPANEL_TEXT_COLOR_VS "SVX_HID_PPROPERTYPANEL_TEXT_COLOR_VS" -#define HID_PPROPERTYPANEL_PARA_TBX_HALIGN "SVX_HID_PPROPERTYPANEL_PARA_TBX_HALIGN" -#define HID_PPROPERTYPANEL_PARA_TBI_HALIGN_LEFT "SVX_HID_PPROPERTYPANEL_PARA_TBI_HALIGN_LEFT" -#define HID_PPROPERTYPANEL_PARA_TBI_HALIGN_CENTER "SVX_HID_PPROPERTYPANEL_PARA_TBI_HALIGN_CENTER" -#define HID_PPROPERTYPANEL_PARA_TBI_HALIGN_RIGHT "SVX_HID_PPROPERTYPANEL_PARA_TBI_HALIGN_RIGHT" -#define HID_PPROPERTYPANEL_PARA_TBI_HALIGN_JUSTIFY "SVX_HID_PPROPERTYPANEL_PARA_TBI_HALIGN_JUSTIFY" -#define HID_PPROPERTYPANEL_PARA_TBX_VALIGN "SVX_HID_PPROPERTYPANEL_PARA_TBX_VALIGN" -#define HID_PPROPERTYPANEL_PARA_TBI_VALIGN_TOP "SVX_HID_PPROPERTYPANEL_PARA_TBI_VALIGN_TOP" -#define HID_PPROPERTYPANEL_PARA_TBI_VALIGN_CENTER "SVX_HID_PPROPERTYPANEL_PARA_TBI_VALIGN_CENTER" -#define HID_PPROPERTYPANEL_PARA_TBI_VALIGN_BOT "SVX_HID_PPROPERTYPANEL_PARA_TBI_VALIGN_BOT" -#define HID_PPROPERTYPANEL_PARA_TBX_BACK_COLOR "SVX_HID_PPROPERTYPANEL_PARA_TBX_BACK_COLOR" -#define HID_PPROPERTYPANEL_PARA_TBI_BACK_COLOR "SVX_HID_PPROPERTYPANEL_PARA_TBI_BACK_COLOR" #define HID_PPROPERTYPANEL_PARA_BACK_COLOR_VS "SVX_HID_PPROPERTYPANEL_PARA_BACK_COLOR_VS" -#define HID_PPROPERTYPANEL_LINE_TBX_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_TBX_WIDTH" -#define HID_PPROPERTYPANEL_LINE_TBI_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_TBI_WIDTH" -#define HID_PPROPERTYPANEL_LINE_TBX_COLOR "SVX_HID_PPROPERTYPANEL_LINE_TBX_COLOR" -#define HID_PPROPERTYPANEL_LINE_TBI_COLOR "SVX_HID_PPROPERTYPANEL_LINE_TBI_COLOR" -#define HID_PPROPERTYPANEL_LINE_TBX_STYLE "SVX_HID_PPROPERTYPANEL_LINE_TBX_STYLE" -#define HID_PPROPERTYPANEL_LINE_TBI_STYLE "SVX_HID_PPROPERTYPANEL_LINE_TBI_STYLE" -#define HID_PPROPERTYPANEL_LINE_MTR_TRANCEPARENCE "SVX_HID_PPROPERTYPANEL_LINE_MTR_TRANCEPARENCE" -#define HID_PPROPERTYPANEL_LINE_LB_START "SVX_HID_PPROPERTYPANEL_LINE_LB_START" -#define HID_PPROPERTYPANEL_LINE_LB_END "SVX_HID_PPROPERTYPANEL_LINE_LB_END" #define HID_PPROPERTYPANEL_LINE_VS_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_VS_WIDTH" #define HID_PPROPERTYPANEL_LINE_MTR_WIDTH "SVX_HID_PPROPERTYPANEL_LINE_MTR_WIDTH" #define HID_PPROPERTYPANEL_LINE_VS_COLOR "SVX_HID_PPROPERTYPANEL_LINE_VS_COLOR" #define HID_PPROPERTYPANEL_LINE_VS_STYLE "SVX_HID_PPROPERTYPANEL_LINE_VS_STYLE" #define HID_PPROPERTYPANEL_LINE_BTN_STYLE "SVX_HID_PPROPERTYPANEL_LINE_BTN_STYLE" #define HID_PPROPERTYPANEL_TEXT_SPACING_VS "SVX_HID_PPROPERTYPANEL_TEXT_SPACING_VS" -#define HID_PPROPERTYPANEL_LINE_LB_EDGESTYLE "SVX_HID_PPROPERTYPANEL_LINE_LB_EDGESTYLE" -#define HID_PPROPERTYPANEL_LINE_LB_CAPSTYLE "SVX_HID_PPROPERTYPANEL_LINE_LB_CAPSTYLE" -//add for position and size -#define HID_PROPERTY_PANEL_POSIZE_MTR_FLD_WIDTH "SVX_HID_PROPERTY_PANEL_POSIZE_MTR_FLD_WIDTH" -#define HID_PROPERTY_PANEL_POSIZE_MTR_FLD_HEIGHT "SVX_HID_PROPERTY_PANEL_POSIZE_MTR_FLD_HEIGHT" -#define HID_PROPERTY_PANEL_POSIZE_CBX_SCALE "SVX_HID_PROPERTY_PANEL_POSIZE_CBX_SCALE" -#define HID_PROPERTY_PANEL_POSIZE_MF_HORIZONTAL "SVX_HID_PROPERTY_PANEL_POSIZE_MF_HORIZONTAL" -#define HID_PROPERTY_PANEL_POSIZE_MF_VERTICAL "SVX_HID_PROPERTY_PANEL_POSIZE_MF_VERTICAL" -#define HID_PROPERTY_PANEL_POSIZE_MTR_FLD_ANGLE "SVX_HID_PROPERTY_PANEL_POSIZE_MTR_FLD_ANGLE" -#define HID_PROPERTY_PANEL_POSIZE_TBX_FLIP "SVX_HID_PROPERTY_PANEL_POSIZE_TBX_FLIP" -#define HID_PROPERTY_PANEL_POSIZE_FLIP_VERTICAL "SVX_HID_PROPERTY_PANEL_POSIZE_FLIP_VERTICAL" -#define HID_PROPERTY_PANEL_POSIZE_FLIP_HORIZONTAL "SVX_HID_PROPERTY_PANEL_POSIZE_FLIP_HORIZONTAL" -#define HID_PROPERTY_PANEL_POSIZE_DIAL_CONTROL "SVX_HID_PROPERTY_PANEL_POSIZE_DIAL_CONTROL" -//end -//add for graphic -#define HID_PROPERTY_PANEL_GRAPHIC_MTR_BRIGHT "SVX_HID_PROPERTY_PANEL_GRAPHIC_MTR_BRIGHT" -#define HID_PROPERTY_PANEL_GRAPHIC_MTR_CONTRAST "SVX_HID_PROPERTY_PANEL_GRAPHIC_MTR_CONTRAST" -#define HID_PROPERTY_PANEL_GRAPHIC_LB_COLORMODE "SVX_HID_PROPERTY_PANEL_GRAPHIC_LB_COLORMODE" -#define HID_PROPERTY_PANEL_GRAPHIC_MTR_TRANSP "SVX_HID_PROPERTY_PANEL_GRAPHIC_MTR_TRANSP" -#define HID_PROPERTY_PANEL_GRAPHIC_MTR_RED "SVX_HID_PROPERTY_PANEL_GRAPHIC_MTR_RED" -#define HID_PROPERTY_PANEL_GRAPHIC_MTR_GREEN "SVX_HID_PROPERTY_PANEL_GRAPHIC_MTR_GREEN" -#define HID_PROPERTY_PANEL_GRAPHIC_MTR_BLUE "SVX_HID_PROPERTY_PANEL_GRAPHIC_MTR_BLUE" -#define HID_PROPERTY_PANEL_GRAPHIC_MTR_GAMMA "SVX_HID_PROPERTY_PANEL_GRAPHIC_MTR_GAMMA" -//end - -#define HID_PROPERTYPANEL_POSIZE_SECTION "SVX_HID_PROPERTYPANEL_POSIZE_SECTION" -#define HID_PROPERTYPANEL_GRAPHIC_SECTION "SVX_HID_PROPERTYPANEL_GRAPHIC_SECTION" - -// Insert panel -#define HID_SIDEBAR_INSERT_PANEL "HID_SIDEBAR_INSERT_PANEL" -#define HID_SIDEBAR_INSERT_TOOLBOX "HID_SIDEBAR_INSERT_TOOLBOX" - -#define HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET "SVX_HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET" -#define HID_PPROPERTYPANEL_PARA_TBI_NUM "SVX_HID_PPROPERTYPANEL_PARA_TBI_NUM" -#define HID_PPROPERTYPANEL_PARA_TBI_BULLET "SVX_HID_PPROPERTYPANEL_PARA_TBI_BULLET" -#define HID_PPROPERTYPANEL_PARA_TBX_INC_DEC "SVX_HID_PPROPERTYPANEL_PARA_TBX_INC_DEC" -#define HID_PPROPERTYPANEL_PARA_TBI_INC "SVX_HID_PPROPERTYPANEL_PARA_TBI_INC" -#define HID_PPROPERTYPANEL_PARA_TBI_DEC "SVX_HID_PPROPERTYPANEL_PARA_TBI_DEC" -#define HID_PPROPERTYPANEL_PARA_TBX_INDENT_INC_DEC "SVX_HID_PPROPERTYPANEL_PARA_TBX_INDENT_INC_DEC" -#define HID_PPROPERTYPANEL_PARA_TBI_INDENT_INC "SVX_HID_PPROPERTYPANEL_PARA_TBI_INDENT_INC" -#define HID_PPROPERTYPANEL_PARA_TBI_INDENT_DEC "SVX_HID_PPROPERTYPANEL_PARA_TBI_INDENT_DEC" -#define HID_PPROPERTYPANEL_PARA_TBI_INDENT_HANG "SVX_HID_PPROPERTYPANEL_PARA_TBI_INDENT_HANG" -#define HID_PPROPERTYPANEL_PARA_TBX_INDENTP_INC_DEC "SVX_HID_PPROPERTYPANEL_PARA_TBX_INDENTP_INC_DEC" -#define HID_PPROPERTYPANEL_PARA_TBI_INDENTP_INC "SVX_HID_PPROPERTYPANEL_PARA_TBI_INDENTP_INC" -#define HID_PPROPERTYPANEL_PARA_TBI_INDENTP_DEC "SVX_HID_PPROPERTYPANEL_PARA_TBI_INDENTP_DEC" -#define HID_PPROPERTYPANEL_PARA_TBI_INDENTP_HANG "SVX_HID_PPROPERTYPANEL_PARA_TBI_INDENTP_HANG" -#define HID_PPROPERTYPANEL_PARA_TBX_LINESP "SVX_HID_PPROPERTYPANEL_PARA_TBX_LINESP" -#define HID_PPROPERTYPANEL_PARA_TBI_LINESP "SVX_HID_PPROPERTYPANEL_PARA_TBI_LINESP" -#define HID_PPROPERTYPANEL_AREA_TBX_COLOR "SVX_HID_PPROPERTYPANEL_AREA_TBX_COLOR" -#define HID_PPROPERTYPANEL_AREA_TBI_COLOR "SVX_HID_PPROPERTYPANEL_AREA_TBI_COLOR" #define HID_PPROPERTYPANEL_AREA_COLOR_VS "SVX_HID_PPROPERTYPANEL_AREA_COLOR_VS" -//add end - -#define HID_PPROPERTYPANEL_AREA_TBX_GRADIENT "SVX_HID_PPROPERTYPANEL_AREA_TBX_GRADIENT" -#define HID_PPROPERTYPANEL_AREA_TBI_GRADIENT "SVX_HID_PPROPERTYPANEL_AREA_TBI_GRADIENT" -#define HID_PROPERTYPANEL_SECTIONPAGE_END "SVX_HID_PROPERTYPANEL_SECTIONPAGE_END" #define HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES "SVX_HID_PPROPERTYPANEL_AREA_LB_FILL_TYPES" #define HID_PPROPERTYPANEL_AREA_LB_FILL_ATTR "SVX_HID_PPROPERTYPANEL_AREA_LB_FILL_ATTR" diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 173dd3f6305a..a18ddbf94718 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -31,7 +31,6 @@ #include <editeng/unolingu.hxx> #include <svx/dialmgr.hxx> #include "svx/dialogs.hrc" -#include "ctredlin.hrc" #include <svx/ctredlin.hxx> #include "helpid.hrc" diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc deleted file mode 100644 index 417192f165e0..000000000000 --- a/svx/source/dialog/ctredlin.hrc +++ /dev/null @@ -1,23 +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 . - */ - -#define TP_FILTER 11 -#define TP_VIEW 12 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 88269f5a2849..9ba1e3c43911 100644 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -161,114 +161,6 @@ #define BROKEN_CONTROLWIDTH (BROKEN_COL4-BROKEN_COL0) -// TabPage Error Report Welcome -// most defines equal to TabPage Recovery - - -// TabPage Error Report Send -// borrow basic metrics from TabPage Recovery - -#define FT_ERRSEND_DOCTYPE 20 -#define ED_ERRSEND_DOCTYPE 21 -#define FT_ERRSEND_USING 22 -#define ML_ERRSEND_USING 23 -#define BTN_ERRSEND_SHOWREP 24 -#define BTN_ERRSEND_OPT 25 -#define CB_ERRSEND_CONTACT 26 -#define FT_ERRSEND_EMAILADDR 27 -#define ED_ERRSEND_EMAILADDR 28 - -#define ERRSEND_WIDTH (RECOV_WIDTH) -#define ERRSEND_HEIGHT (RECOV_HEIGHT) -#define ERRSEND_TITLEWINHEIGHT SAVE_TITLEWINHEIGHT - -#define ERRSEND_COL0 (RSC_SP_DLG_INNERBORDER_LEFT) -#define ERRSEND_COL1 (ERRSEND_COL0+RSC_SP_CHK_TEXTINDENT) - -#define ERRSEND_COL4 (ERRSEND_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define ERRSEND_COL3 (ERRSEND_COL4-RSC_CD_PUSHBUTTON_WIDTH) -#define ERRSEND_COL2 (ERRSEND_COL3-RSC_SP_CTRL_X) - -#define ERRSEND_COL6 (ERRSEND_COL3-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH) -#define ERRSEND_COL5 (ERRSEND_COL6-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH) - -#define ERRSEND_CONTROLWIDTH1 (ERRSEND_COL4-ERRSEND_COL0) -#define ERRSEND_CONTROLWIDTH2 (ERRSEND_COL2-ERRSEND_COL0) -#define ERRSEND_CONTROLWIDTH3 (ERRSEND_COL2-ERRSEND_COL1) - -#define ERRSEND_ROW0 ((ERRSEND_TITLEWINHEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -#define ERRSEND_ROW1 (ERRSEND_TITLEWINHEIGHT) -#define ERRSEND_ROW2 (ERRSEND_ROW1+RSC_SP_CTRL_Y) -#define ERRSEND_ROW3 (ERRSEND_ROW2+3*RSC_CD_FIXEDTEXT_HEIGHT) -#define ERRSEND_ROW4 (ERRSEND_ROW3+RSC_SP_CTRL_GROUP_Y) -#define ERRSEND_ROW5 (ERRSEND_ROW4+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define ERRSEND_ROW6 (ERRSEND_ROW5+RSC_CD_TEXTBOX_HEIGHT) -#define ERRSEND_ROW7 (ERRSEND_ROW6+RSC_SP_CTRL_Y) -#define ERRSEND_ROW8 (ERRSEND_ROW7+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define ERRSEND_ROW9 (ERRSEND_ROW8+RSC_CD_PUSHBUTTON_HEIGHT) -#define ERRSEND_ROW10 (ERRSEND_ROW9+RSC_SP_CTRL_GROUP_Y) - -#define ERRSEND_ROW16 (ERRSEND_HEIGHT-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_HEIGHT) -#define ERRSEND_ROW15 (ERRSEND_ROW16-RSC_SP_CTRL_GROUP_Y-RSC_CD_FIXEDLINE_HEIGHT) -#define ERRSEND_ROW14 (ERRSEND_ROW15-RSC_SP_CTRL_GROUP_Y-RSC_CD_TEXTBOX_HEIGHT) -#define ERRSEND_ROW13 (ERRSEND_ROW14-RSC_SP_CTRL_GROUP_Y-RSC_CD_FIXEDTEXT_HEIGHT) -#define ERRSEND_ROW12 (ERRSEND_ROW13-RSC_SP_CTRL_GROUP_Y-RSC_CD_CHECKBOX_HEIGHT) - -// Error Report Options Dialog - -#define ERROPT_WIDTH 220 -#define ERROPT_HEIGHT 180 - -#define FL_ERROPT_PROXY 1 -#define BTN_ERROPT_SYSTEM 2 -#define BTN_ERROPT_DIRECT 3 -#define BTN_ERROPT_MANUAL 4 -#define FT_ERROPT_PROXYSERVER 5 -#define ED_ERROPT_PROXYSERVER 6 -#define FT_ERROPT_PROXYPORT 7 -#define ED_ERROPT_PROXYPORT 8 -#define FT_ERROPT_DESCRIPTION 9 -#define FL_ERROPT_BUTTONS 10 -#define BTN_ERROPT_OK 11 -#define BTN_ERROPT_CANCEL 12 - -#define ERROPT_COLA (RSC_SP_DLG_INNERBORDER_LEFT) -#define ERROPT_COLB (ERROPT_COLA + RSC_SP_CTRL_X) -#define ERROPT_COLC (ERROPT_COLB + RSC_SP_CHK_TEXTINDENT) - -#define ERROPT_COLF (ERROPT_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT) -#define ERROPT_COLE (ERROPT_COLF - RSC_CD_PUSHBUTTON_WIDTH) -#define ERROPT_COLD (ERROPT_COLE - RSC_SP_CTRL_DESC_X - RSC_CD_PUSHBUTTON_WIDTH) - -#define ERROPT_ROW0 (RSC_SP_DLG_INNERBORDER_TOP) -#define ERROPT_ROW1 (ERROPT_ROW0 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_CTRL_Y) -#define ERROPT_ROW2 (ERROPT_ROW1 + RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) -#define ERROPT_ROW3 (ERROPT_ROW2 + RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) -#define ERROPT_ROW4 (ERROPT_ROW3 + RSC_CD_RADIOBUTTON_HEIGHT + RSC_SP_CTRL_GROUP_Y) -#define ERROPT_ROW5 (ERROPT_ROW4 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y) -#define ERROPT_ROW6 (ERROPT_ROW5 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y) - -#define ERROPT_ROW9 (ERROPT_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) -#define ERROPT_ROW8 (ERROPT_ROW9 - RSC_SP_CTRL_DESC_Y - RSC_CD_FIXEDLINE_HEIGHT) -#define ERROPT_ROW7 (ERROPT_ROW8 - RSC_SP_CTRL_DESC_Y) - -#define ERROPT_SERVER_WIDTH 150 -#define ERROPT_PORT_WIDTH (ERROPT_COLF-ERROPT_COLC-RSC_SP_CTRL_GROUP_X-ERROPT_SERVER_WIDTH) - -// Error Report Preview Dialog - -#define ERRPREVIEW_WIDTH 300 -#define ERRPREVIEW_HEIGHT 200 - -#define ML_ERRPREVIEW_CONTENT 1 -#define BTN_ERRPREVIEW_OK 2 -#define ERRPREVIEW_COLA (RSC_SP_DLG_INNERBORDER_LEFT) -#define ERRPREVIEW_COLB (ERRPREVIEW_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT - RSC_CD_PUSHBUTTON_WIDTH) -#define ERRPREVIEW_COLC (ERRPREVIEW_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT) -#define ERRPREVIEW_ROW0 (RSC_SP_DLG_INNERBORDER_TOP) -#define ERRPREVIEW_ROW1 (ERRPREVIEW_ROW2 - RSC_SP_CTRL_Y) -#define ERRPREVIEW_ROW2 (ERRPREVIEW_HEIGHT - RSC_SP_DLG_INNERBORDER_BOTTOM - RSC_CD_PUSHBUTTON_HEIGHT) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc index 0977b6177e83..74ae09242e89 100644 --- a/svx/source/inc/datanavi.hrc +++ b/svx/source/inc/datanavi.hrc @@ -80,14 +80,6 @@ #define STR_HEADER_PREFIX 10 #define STR_HEADER_URL 11 -// class AddModelDialog -#define FL_MODEL 10 -#define FT_MODEL_NAME 11 -#define ED_MODEL_NAME 12 - -// class AddModelDialog -#define CB_MODIFIES_DOCUMENT 1 - #endif //_SVX_DATANAVI_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc index 7112ab4ccb4b..39a6283d59af 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hrc +++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc @@ -63,7 +63,6 @@ #define CONTROL_HEIGHT 12 #define CONTROL_WIDTH 45 #define LISTBOX_HEIGHT 80 -#define ROTATE_BUTTON_WIDTH 13 #define ROTATE_BUTTON_SPACING 15 #define POP_WIDTH 2*POPUPPANEL_MARGIN_HORIZONTAL+2*CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL #define POP_HEIGHT 2*POPUPPANEL_MARGIN_VERTICAL + 4*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + MBOX_HEIGHT ) + 3*CONTROL_SPACING_VERTICAL diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc index 02547f7effad..28598db7d1fd 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hrc +++ b/svx/source/sidebar/line/LinePropertyPanel.hrc @@ -21,15 +21,9 @@ #define CUSTOM_W 74 #define CUSTOM_H POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT + 12 + TEXT_CONTROL_SPACING_VERTICAL -#define TBI_STYLE 14 #define STR_QH_TB_WIDTH 15 #define STR_QH_TB_COLOR 16 -#define FT_EDGESTYLE 18 -#define LB_EDGESTYLE 19 -#define FT_CAPSTYLE 20 -#define LB_CAPSTYLE 21 - #define IMG_COLOR (RID_SVX_SIDEBAR_BEGIN + 20) #define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc index 24866bdebf25..4729c8a4e0c7 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc @@ -38,7 +38,6 @@ #define IID_NUMBER 2 //============================== popup bullet and numbering & back color ========================= #define VS_VALUES 1 -#define IL_BULLET_BITMAPS 2 #define CB_BULLET_MORE 4 #define BMP_BULLET_MORE 5 @@ -57,8 +56,6 @@ #define FT_CUSTOM 14 #define FT_LINE_SPACING 15 #define FT_OF 16 -#define IMG_LPCUSTOMNOBORDER 27 -#define FI_CUSTOM_NOBORDER_LSPACE 28 #define LINE_SPACING 29 #define STR_SPACING1 30 #define STR_SPACING115 31 @@ -73,166 +70,26 @@ #define STR_LS_OF 42 //============================== Help ID ============================== -#define HID_TBX_HORIZONTALALIGNMENT "HID_TBX_HORIZONTALALIGNMENT" -#define HID_TBI_HOR_ALIGN_LEFT "HID_TBI_HOR_ALIGN_LEFT" -#define HID_TBI_HOR_ALIGN_CENTER "HID_TBI_HOR_ALIGN_CENTER" -#define HID_TBI_HOR_ALIGN_RIGHT "HID_TBI_HOR_ALIGN_RIGHT" -#define HID_TBI_HOR_ALIGN_JUSTIFY "HID_TBI_HOR_ALIGN_JUSTIFY" - -#define HID_TBX_VERT_ALIGN "HID_TBX_VERT_ALIGN" -#define HID_TBI_VERT_ALIGN_TOP "HID_TBI_VERT_ALIGN_TOP" -#define HID_TBI_VERT_ALIGN_CENTER "HID_TBI_VERT_ALIGN_CENTER" -#define HID_TBI_VERT_ALIGN_BOT "HID_TBI_VERT_ALIGN_BOT" - -#define HID_TBX_INDENT "HID_TBX_INDENT" -#define HID_TBI_INDENT "HID_TBI_INDENT" -//#define HID_TBX_LINESP 705263129 -//#define HID_TBI_LINESP 705262617 -#define HID_TBX_GRSPACE "HID_TBX_GRSPACE" -#define HID_TBI_GRSPACE "HID_TBI_GRSPACE" -#define HID_TBX_BACK_COLOR "HID_TBX_BACK_COLOR" -#define HID_TBI_BACK_COLOR "HID_TBI_BACK_COLOR" - -//#define HID_TBX_INDENT_INC_DEC 705263121 -//#define HID_TBI_INDENT_DEC 705262662 -//#define HID_TBI_INDENT_INC 705262661 -//#define HID_TBX_UL_INC_DEC 705263137 -//#define HID_TBI_UL_INC 705262663 -//#define HID_TBI_UL_DEC 705262664 - -//#define HID_TBX_NUM_BULLET 705263148 -//#define HID_TBI_NUMBERING 705262655 -//#define HID_TBI_BULLET 705262656 - #define HID_POPUP_BULLET_CB_BULLET_MORE "HID_POPUP_BULLET_CB_BULLET_MORE" #define HID_POPUP_BULLET_VS_VALUES "HID_POPUP_BULLET_VS_VALUES" #define HID_POPUP_NUM_CB_NUMBERING_MORE "HID_POPUP_NUM_CB_NUMBERING_MORE" #define HID_POPUP_NUM_VS_NUMBERING "HID_POPUP_NUM_VS_NUMBERING" -#define HID_POPUP_INDENT_ED_INDENT_LEFTINDENT "HID_POPUP_INDENT_ED_INDENT_LEFTINDENT" -#define HID_POPUP_INDENT_ED_INDENT_RIGHTINDENT "HID_POPUP_INDENT_ED_INDENT_RIGHTINDENT" -#define HID_POPUP_INDENT_ED_INDENT_FLINDENT "HID_POPUP_INDENT_ED_INDENT_FLINDENT" -#define HID_POPUP_INDENT_TBX_INDENT_NONE "HID_POPUP_INDENT_TBX_INDENT_NONE" -#define HID_POPUP_INDENT_TBI_INDENT_NONE "HID_POPUP_INDENT_TBI_INDENT_NONE" -#define HID_POPUP_INDENT_TBX_INDENT_BEFORE1 "HID_POPUP_INDENT_TBX_INDENT_BEFORE1" -#define HID_POPUP_INDENT_TBI_INDENT_BEFORE1 "HID_POPUP_INDENT_TBI_INDENT_BEFORE1" -#define HID_POPUP_INDENT_TBX_INDENT_BEFORE2 "HID_POPUP_INDENT_TBX_INDENT_BEFORE2" -#define HID_POPUP_INDENT_TBI_INDENT_BEFORE2 "HID_POPUP_INDENT_TBI_INDENT_BEFORE2" -#define HID_POPUP_INDENT_TBX_INDENT_FLINE "HID_POPUP_INDENT_TBX_INDENT_FLINE" -#define HID_POPUP_INDENT_TBI_INDENT_FLINE "HID_POPUP_INDENT_TBI_INDENT_FLINE" -#define HID_POPUP_INDENT_TBX_INDENT_HANGING "HID_POPUP_INDENT_TBX_INDENT_HANGING" -#define HID_POPUP_INDENT_TBI_INDENT_HANGING "HID_POPUP_INDENT_TBI_INDENT_HANGING" -#define HID_POPUP_INDENT_TBX_INDENT_LCUSTOM "HID_POPUP_INDENT_TBX_INDENT_LCUSTOM" -#define HID_POPUP_INDENT_TBI_INDENT_LCUSTOM "HID_POPUP_INDENT_TBI_INDENT_LCUSTOM" - #define HID_POPUP_LS_LB_LINE_SPACING "HID_POPUP_LS_LB_LINE_SPACING" #define HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT "HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT" #define HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT "HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT" -#define HID_POPUP_LS_TBX_LINESP_1 "HID_POPUP_LS_TBX_LINESP_1" -#define HID_POPUP_LS_TBI_LINESP_1 "HID_POPUP_LS_TBI_LINESP_1" -#define HID_POPUP_LS_TBX_LINESP_15 "HID_POPUP_LS_TBX_LINESP_15" -#define HID_POPUP_LS_TBI_LINESP_15 "HID_POPUP_LS_TBI_LINESP_15" -#define HID_POPUP_LS_TBX_LINESP_2 "HID_POPUP_LS_TBX_LINESP_2" -#define HID_POPUP_LS_TBI_LINESP_2 "HID_POPUP_LS_TBI_LINESP_2" -#define HID_POPUP_LS_TBX_LINESP_115 "HID_POPUP_LS_TBX_LINESP_115" -#define HID_POPUP_LS_TBI_LINESP_115 "HID_POPUP_LS_TBI_LINESP_115" -#define HID_POPUP_LS_TBX_LINESP_LCUSTOM "HID_POPUP_LS_TBX_LINESP_LCUSTOM" -#define HID_POPUP_LS_TBI_LINESP_LCUSTOM "HID_POPUP_LS_TBI_LINESP_LCUSTOM" - -#define HID_POPUP_PS_ED_SBINDE_TOPDIST "HID_POPUP_PS_ED_SBINDE_TOPDIST" -#define HID_POPUP_PS_ED_SBINDE_BOTTOMDIST "HID_POPUP_PS_ED_SBINDE_BOTTOMDIST" -#define HID_POPUP_PS_TBX_NORMAL "HID_POPUP_PS_TBX_NORMAL" -#define HID_POPUP_PS_TBI_NORMAL "HID_POPUP_PS_TBI_NORMAL" -#define HID_POPUP_PS_TBX_NARROW "HID_POPUP_PS_TBX_NARROW" -#define HID_POPUP_PS_TBI_NARROW "HID_POPUP_PS_TBI_NARROW" -#define HID_POPUP_PS_TBX_WIDE "HID_POPUP_PS_TBX_WIDE" -#define HID_POPUP_PS_TBI_WIDE "HID_POPUP_PS_TBI_WIDE" -#define HID_POPUP_PS_TBX_LASTCUSTOM "HID_POPUP_PS_TBX_LASTCUSTOM" -#define HID_POPUP_PS_TBI_LASTCUSTOM "HID_POPUP_PS_TBI_LASTCUSTOM" //============================== Property ============================== #define _FIXED_TEXT_HEIGHT 9 #define _FIXED_TEXT_WIDTH 40 #define CONTROL_HEIGHT 15 #define CONTROL_WIDTH 45 -#define ALIGNMENT_TBX_HEIGHT 17 -#define ALIGNMENT_TBX_WIDTH 13 #define LISTBOX_HEIGHT 80 -#define IMAGE_SIZE 16 -#define POPUP_TOOLBOX_SIZE 32 #define TOOLBOX_HEIGHT 22 #define TOOLBOX_WIDTH 23 -#define TEXT_SPACING_VERTICAL 2 -#define BUTTON_SPACING 18 -//#define TOOLBOX_ITEM_HEIGHT 17 #define VS_SPACING_WIDTH 78 -//==============================Section page position============================== - -#define TBX_HORI_ALIGN_X SECTIONPAGE_MARGIN_HORIZONTAL + TBX_OUT_BORDER_OFFSET_X/2 -#define TBX_HORI_ALIGN_Y SECTIONPAGE_MARGIN_VERTICAL_TOP - -#define TBX_VERT_ALIGN_X TBX_HORI_ALIGN_X + TBX_OUT_BORDER_OFFSET_X*2 + TOOLBOX_ITEM_WIDTH * 4 + CONTROL_SPACING_HORIZONTAL - -#define TBX_NUM_BULLET_Y TBX_HORI_ALIGN_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL - 1 - -#define FT_PARA_SPACE_X SECTIONPAGE_MARGIN_HORIZONTAL -#define FT_PARA_SPACE_Y TBX_NUM_BULLET_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL - 3 -#define FT_PARA_SPACE_Y2 TBX_HORI_ALIGN_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL - 2 - -#define TBX_PARA_SPACE_INC_DEC_X TBX_HORI_ALIGN_X -#define TBX_PARA_SPACE_INC_DEC_Y FT_PARA_SPACE_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL -#define TBX_PARA_SPACE_INC_DEC_Y2 FT_PARA_SPACE_Y2 + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL - -#define FT_PARA_INDENT_X TBX_VERT_ALIGN_X - -#define FT_PARA_INDENT_Y2 FT_PARA_SPACE_Y2 - -#define TBX_PARA_INDENT_INC_DEC_X TBX_VERT_ALIGN_X -#define TBX_PARA_INDENT_INC_DEC_Y TBX_PARA_SPACE_INC_DEC_Y -#define TBX_PARA_INDENT_INC_DEC_Y2 TBX_PARA_SPACE_INC_DEC_Y2 - -#define MBX_TOP_DIST_X FT_PARA_SPACE_X + TOOLBOX_ITEM_WIDTH -#define MBX_TOP_DIST_Y TBX_PARA_SPACE_INC_DEC_Y + TOOLBOX_ITEM_WIDTH + CONTROL_SPACING_VERTICAL + 4*TBX_OUT_BORDER_OFFSET_Y - 1 -#define MBX_TOP_DIST_Y2 TBX_PARA_SPACE_INC_DEC_Y2 + TOOLBOX_ITEM_WIDTH + CONTROL_SPACING_VERTICAL + 4*TBX_OUT_BORDER_OFFSET_Y - 1 -#define MBX_BOT_DIST_X MBX_TOP_DIST_X -#define MBX_BOT_DIST_Y MBX_TOP_DIST_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL -#define MBX_BOT_DIST_Y2 MBX_TOP_DIST_Y2 + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL - -#define IMG_SPACE_X FT_PARA_SPACE_X - 3 -#define IMG_SPACE1_Y MBX_TOP_DIST_Y - 1 -#define IMG_SPACE2_Y MBX_BOT_DIST_Y - 1 -#define IMG_SPACE1_Y2 MBX_TOP_DIST_Y2 - 1 -#define IMG_SPACE2_Y2 MBX_BOT_DIST_Y2 - 1 - -#define MBX_LEFT_DIST_X FT_PARA_INDENT_X + TOOLBOX_ITEM_WIDTH -#define MBX_LEFT_DIST_Y MBX_TOP_DIST_Y -#define MBX_LEFT_DIST_Y2 MBX_TOP_DIST_Y2 -#define MBX_RIGHT_DIST_X MBX_LEFT_DIST_X -#define MBX_RIGHT_DIST_Y MBX_BOT_DIST_Y -#define MBX_RIGHT_DIST_Y2 MBX_BOT_DIST_Y2 -#define MBX_FLINE_DIST_X MBX_LEFT_DIST_X -#define MBX_FLINE_DIST_Y MBX_RIGHT_DIST_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL -#define MBX_FLINE_DIST_Y2 MBX_RIGHT_DIST_Y2 + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL - -#define TBX_LINE_SPACE_X TBX_HORI_ALIGN_X -#define TBX_LINE_SPACE_Y MBX_FLINE_DIST_Y -#define TBX_LINE_SPACE_Y2 MBX_FLINE_DIST_Y2 - -#define PARA_SECTIONPAGE_HEIGHT MBX_FLINE_DIST_Y + TOOLBOX_ITEM_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT -#define PARA_SECTIONPAGE_HEIGHT_2 MBX_FLINE_DIST_Y2 + TOOLBOX_ITEM_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT - -#define LINE_X_WHITE FT_PARA_INDENT_X - 5 -#define LINE_TOP_Y FT_PARA_INDENT_Y + 1 -#define LINE_TOP_Y2 FT_PARA_INDENT_Y2 + 1 -#define LINE_BOT_Y TBX_LINE_SPACE_Y + TOOLBOX_ITEM_HEIGHT - 1 -#define LINE_BOT_Y2 TBX_LINE_SPACE_Y2 + TOOLBOX_ITEM_HEIGHT - 1 - //==============================numbering and bullet============================== -#define NB_MARGIN_VERTICAL POPUPPANEL_MARGIN_VERTICAL -#define NB_MARGIN_HORIZONTAL POPUPPANEL_MARGIN_HORIZONTAL -#define SPACING_VERTICAL_S3 8 -//#define SPACING_VERTICAL_S1 12 #define POPUPPANEL_MARGIN_NB 4 #define NB_IMAGE_WIDTH 25 @@ -262,7 +119,6 @@ #define POPUP_HEIGHT_NUM VS_HEIGHT_NUM + POPUPPANEL_MARGIN_NB * 3 + CUST_MORE_BUTTON_HEIGHT #define CUST_MORE_BUTTON_X 1 -#define CUST_MORE_BUTTON_IMG_OFF_X 2 //NB_MARGIN_HORIZONTAL - CUST_MORE_BUTTON_X + OFFSET_X //==============================Line Spacing popup page======================= diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index 91ecf45cf298..8938c367c157 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -21,15 +21,6 @@ #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; -#define SVX_PROPERTYPANEL_PARA_VERT_IDLIST \ - IdList = \ - { \ - IID_VERT_TOP ; \ - IID_VERT_CENTER ; \ - IID_VERT_BOTTOM ; \ - }; \ - IdCount = { 3 ; }; - #define SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST \ IdList = \ { \ diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 9d88fd1fde45..957c2aeeff51 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -18,7 +18,7 @@ */ #include "svx/svdstr.hrc" - // Ab hier gecachte Strings + String STR_ObjNameSingulNONE { Text [ en-US ] = "draw object" ; @@ -453,7 +453,6 @@ String STR_ObjNamePluralGRAFSVG }; - String STR_ObjNameSingulOLE2 { Text [ en-US ] = "embedded object (OLE)" ; @@ -547,9 +546,6 @@ String STR_ObjNameSingulPlural }; - - - // New in 537: names for 3D objects String STR_ObjNameSingulCube3d { @@ -627,9 +623,6 @@ String STR_ObjNamePluralSphere3d }; - - - String STR_EditWithCopy { Text [ en-US ] = "with copy" ; @@ -1118,7 +1111,6 @@ String STR_StandardLayerName }; - String STR_ItemValON { Text [ en-US ] = "on" ; @@ -1570,9 +1562,6 @@ String STR_ItemNam_SHEARANGLE }; - - // End of cached strings - // Now: bitmaps: Bitmap BMAP_GrafikEi { File = "grafikei.png" ; }; Bitmap BMAP_GrafikDe { File = "grafikde.png" ; }; |