cui/source/customize/acccfg.src | 2 cui/source/dialogs/cuires.src | 4 - dbaccess/source/ui/inc/dbu_dlg.hrc | 11 --- include/svtools/controldims.hrc | 22 ------ sc/source/ui/sidebar/CellAppearancePropertyPanel.src | 3 sd/source/ui/app/tbxids_tmpl.src | 1 sd/source/ui/app/toolbox2_tmpl.src | 35 ++++++++-- sd/source/ui/dlg/LayerDialog.src | 2 sd/source/ui/dlg/animobjs.src | 3 sd/source/ui/dlg/navigatr.src | 1 svx/source/dialog/docrecovery.hrc | 15 ---- svx/source/sidebar/area/AreaPropertyPanel.hrc | 8 -- svx/source/sidebar/area/AreaPropertyPanel.src | 3 svx/source/sidebar/line/LinePropertyPanel.hrc | 4 - svx/source/sidebar/line/LinePropertyPanel.src | 4 - svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 4 - sw/source/ui/dbui/mmaddressblockpage.src | 3 sw/source/ui/fldui/fldui.src | 12 +-- wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py | 1 wizards/source/formwizard/dbwizres.src | 1 20 files changed, 38 insertions(+), 101 deletions(-)
New commits: commit ec8754183825c3889eae7614433fba5727310e19 Author: Thomas Arnhold <tho...@arnhold.org> Date: Tue Aug 26 21:23:46 2014 +0200 resource files: remove unused definitions Change-Id: Ic782eab6943aa8e659acfceb9f20dac76224c258 diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc index 307c09d..1089be5 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hrc @@ -25,19 +25,8 @@ #define PAGE_Y 215 #define WIZARD_PAGE_X 225 #define WIZARD_PAGE_Y 240 -#define START_X 6 - -#define LISTBOX_HEIGHT 12 -#define FIXEDTEXT_HEIGHT 8 -#define RELATED_CONTROLS 4 -#define UNRELATED_CONTROLS 7 -#define EDIT_HEIGHT 12 -#define BUTTON_HEIGHT 14 -#define BUTTON_WIDTH 50 //constants for the wizards -#define INIT_Y 28 -#define INDENTED_X 6 #define INDENT_BELOW_RADIO 10 #define STR_PARENTTITLE_GENERAL RID_STR_DLG_START + 0 diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hrc index 6f62434..81972f5 100644 --- a/include/svtools/controldims.hrc +++ b/include/svtools/controldims.hrc @@ -27,7 +27,6 @@ // Base #define RSC_BS_CHARHEIGHT 8 -#define RSC_BS_CHARWIDTH 4 // control dimensions #define RSC_CD_PUSHBUTTON_WIDTH 50 @@ -38,42 +37,21 @@ #define RSC_CD_TEXTBOX_HEIGHT 12 // also numeric fields etc. -#define RSC_CD_CHECKBOX_HEIGHT 10 // also tristate #define RSC_CD_RADIOBUTTON_HEIGHT 10 // spacings #define RSC_SP_CTRL_X 6 // controls that are unrelated #define RSC_SP_CTRL_Y 7 -#define RSC_SP_CTRL_GROUP_X 3 // related controls, or controls in a groupbox #define RSC_SP_CTRL_GROUP_Y 4 #define RSC_SP_CTRL_DESC_X 3 // between description text and related control #define RSC_SP_CTRL_DESC_Y 3 -// overruled spacings between certain controls -#define RSC_SP_FLGR_SPACE_X 6 // between groupings made with FixedLine -#define RSC_SP_FLGR_SPACE_Y 4 -#define RSC_SP_GRP_SPACE_X 6 // between groupings made with GroupBox - // dialog inner border #define RSC_SP_DLG_INNERBORDER_LEFT 6 #define RSC_SP_DLG_INNERBORDER_TOP 6 #define RSC_SP_DLG_INNERBORDER_RIGHT 6 #define RSC_SP_DLG_INNERBORDER_BOTTOM 6 -// tab page inner border -#define RSC_SP_TBPG_INNERBORDER_TOP 3 -#define RSC_SP_TBPG_INNERBORDER_RIGHT 6 -#define RSC_SP_TBPG_INNERBORDER_BOTTOM 6 - -// FixedLine group inner border -#define RSC_SP_FLGR_INNERBORDER_TOP 3 -#define RSC_SP_FLGR_INNERBORDER_BOTTOM 0 - -// GroupBox inner border -#define RSC_SP_GRP_INNERBORDER_LEFT 6 // for GroupBox groupings -#define RSC_SP_GRP_INNERBORDER_TOP 6 -#define RSC_SP_GRP_INNERBORDER_RIGHT 6 - #endif // _SVT_CONTROLDIMS_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src index 569171f..fd6a287 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src @@ -21,9 +21,6 @@ #include "sc.hrc" #include "helpids.h" -#define TOOLBOX_WIDTH 50 -#define TOOLBOX_HEIGHT 15 - #define TOOLBOX_BORDER_WIDTH 107 #define POPUPPANEL_MARGIN_SMALL_PIXEL 8 diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index e0df77f..460858d 100644 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.src @@ -22,9 +22,6 @@ #include "animobjs.hrc" #include "helpids.h" -#define BUTTON_WIDTH 16 -#define BUTTON_HEIGHT 14 -#define BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT ); #define MIN_BUTTON_WIDTH 12 #define MIN_BUTTON_HEIGHT 12 #define MIN_BUTTON_SIZE MAP_APPFONT( MIN_BUTTON_WIDTH, MIN_BUTTON_HEIGHT ); diff --git a/sd/source/ui/dlg/navigatr.src b/sd/source/ui/dlg/navigatr.src index f0b6aad..74db25a 100644 --- a/sd/source/ui/dlg/navigatr.src +++ b/sd/source/ui/dlg/navigatr.src @@ -22,7 +22,6 @@ #include "res_bmp.hrc" #define BUTTON_WIDTH 13 #define BUTTON_COUNT 7 -#define BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, BUTTON_WIDTH ); Window FLT_NAVIGATOR { HelpId = HID_SD_NAVIGATOR ; diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 205ef5e..d6eef7c 100644 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -31,31 +31,16 @@ #define SAVE_TITLEWINHEIGHT 36 #define SAVE_COL0 (RSC_SP_DLG_INNERBORDER_LEFT) #define SAVE_COL2 (SAVE_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define SAVE_CONTROLWIDTH (SAVE_COL2-SAVE_COL0) // Save Progress Dialog #define SAVEPROGR_WIDTH 240 #define SAVEPROGR_COL0 (RSC_SP_DLG_INNERBORDER_LEFT) #define SAVEPROGR_COL1 (SAVEPROGR_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define SAVEPROGR_ROW0 (RSC_SP_DLG_INNERBORDER_TOP) -#define SAVEPROGR_ROW1 (SAVEPROGR_ROW0+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y) -#define SAVEPROGR_ROW2 (SAVEPROGR_ROW1+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define SAVEPROGR_ROW3 (SAVEPROGR_ROW2+PROGR_HEIGHT) #define SAVEPROGR_CONTROLWIDTH (SAVEPROGR_COL1-SAVEPROGR_COL0) -#define SAVEPROGR_HEIGHT (SAVEPROGR_ROW3+RSC_SP_DLG_INNERBORDER_BOTTOM) -#define RECOV_WIDTH SAVE_WIDTH #define RECOV_HEIGHT SAVE_HEIGHT #define RECOV_TITLEWINHEIGHT SAVE_TITLEWINHEIGHT #define RECOV_DESCRHEIGHT 6*RSC_CD_FIXEDTEXT_HEIGHT -#define RECOV_COL1 (RSC_SP_DLG_INNERBORDER_LEFT) -#define RECOV_COL3 (RECOV_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT) -#define RECOV_COL_G (RECOV_COL3) -#define RECOV_COL_F (RECOV_COL_G-RSC_CD_PUSHBUTTON_WIDTH) -#define RECOV_COL_E (RECOV_COL_F-RSC_SP_CTRL_X) -#define RECOV_COL_D (RECOV_COL_E-RSC_CD_PUSHBUTTON_WIDTH) -#define RECOV_COL_C (RECOV_COL_D-RSC_CD_PUSHBUTTON_WIDTH) -#define RECOV_ROW0 ((RECOV_TITLEWINHEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) #define RECOV_ROW1 (RECOV_TITLEWINHEIGHT) #define RECOV_ROW2 (RECOV_ROW1+RSC_SP_CTRL_Y) #define RECOV_ROW3 (RECOV_ROW2+RECOV_DESCRHEIGHT+RSC_SP_CTRL_DESC_Y) diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc index b5d6ac1..c50783b 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hrc +++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc @@ -24,8 +24,6 @@ #define VS_COLOR 1 -#define MTR_TRANSPARENT 7 - #define FT_TRGR_CENTER_X 9 #define MTR_TRGR_CENTER_X 10 #define FT_TRGR_CENTER_Y 11 @@ -44,14 +42,8 @@ #define BTN_LEFT_SECOND 22 #define BTN_RIGHT_FIRST 23 -#define STR_HELP_COLOR 41 - #define FIXED_TEXT_HEIGHT 9 -#define FIXED_TEXT_WIDTH 40 -#define MBOX_WIDTH 50 -#define CONTROL_HEIGHT 12 #define CONTROL_WIDTH 45 -#define LISTBOX_HEIGHT 80 #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/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src index 2e9a8de..bc7a161 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.src +++ b/svx/source/sidebar/area/AreaPropertyPanel.src @@ -21,9 +21,6 @@ #include <svx/dialogs.hrc> #include "helpid.hrc" -#define TOOLBOX_WIDTH 50 -#define TOOLBOX_HEIGHT 17 - Image IMG_AXIAL { ImageBitmap = Bitmap{File = "symphony/axial.png";}; diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc index 636c412..cf1b7fc 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hrc +++ b/svx/source/sidebar/line/LinePropertyPanel.hrc @@ -22,14 +22,10 @@ #define CUSTOM_W 74 #define CUSTOM_H POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT + 12 + TEXT_CONTROL_SPACING_VERTICAL -#define STR_QH_TB_WIDTH 15 -#define STR_QH_TB_COLOR 16 - //color popup page #define VS_COLOR 1 //style popup page -#define VS_STYLE 1 #define PB_OPTIONS 2 //width popup page diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src index b36f30c..a41f10b 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.src +++ b/svx/source/sidebar/line/LinePropertyPanel.src @@ -21,10 +21,6 @@ #include <svx/dialogs.hrc> #include "helpid.hrc" -#define TOOLBOX_WIDTH 50 -#define TOOLBOX_HEIGHT 14 -#define LISTBOX_HEIGHT 99 - Image IMG_LINE_COLOR { ImageBitmap = Bitmap{File = "symphony/Line_color.png";}; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc index 8a5c1dc..25eda69 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc @@ -69,10 +69,7 @@ #define _FIXED_TEXT_HEIGHT 9 #define _FIXED_TEXT_WIDTH 40 #define CONTROL_HEIGHT 15 -#define CONTROL_WIDTH 45 #define LISTBOX_HEIGHT 80 -#define TOOLBOX_HEIGHT 22 -#define TOOLBOX_WIDTH 23 #define VS_SPACING_WIDTH 78 //==============================numbering and bullet============================== @@ -91,7 +88,6 @@ #define NUM_IMAGE_SPACING NB_IMAGE_SPACING #define FIXED_TEXT_HEIGHT 13 -#define FIXED_TEXT_WIDTH 80 #define CUST_MORE_BUTTON_HEIGHT 15 #define VS_WIDTH_BULLET BULLET_IMAGE_WIDTH*3+BULLET_IMAGE_SPACING*2 diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src index eae338e..aa2f355 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.src +++ b/sw/source/ui/dbui/mmaddressblockpage.src @@ -19,9 +19,6 @@ #include <dbui.hrc> #include <helpid.h> -#define WORKAROUND\ - Text [ en-US ] = "New Address Block"; - String ST_TITLE_EDIT { Text [ en-US ] = "Edit Address Block"; diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py index 77f20e4..e61b6a7 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py @@ -22,7 +22,6 @@ class LetterWizardDialogResources(object): RID_LETTERWIZARDGREETING_START = 3080 RID_LETTERWIZARDSALUTATION_START = 3090 RID_LETTERWIZARDROADMAP_START = 3100 - RID_LETTERWIZARDLANGUAGE_START = 3110 RID_RID_COMMON_START = 500 def __init__(self, oWizardResource): diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index 40e1670..3680979 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -31,7 +31,6 @@ #define RID_LETTERWIZARDGREETING_START 3080 #define RID_LETTERWIZARDSALUTATION_START 3090 #define RID_LETTERWIZARDROADMAP_START 3100 -#define RID_LETTERWIZARDLANGUAGE_START 3110 #define RID_FAXWIZARDDIALOG_START 3200 #define RID_FAXWIZARDCOMMUNICATION_START 3270 commit c9faae3481b18a84b1583a18003c297dfe7264e6 Author: Thomas Arnhold <tho...@arnhold.org> Date: Tue Aug 26 19:18:51 2014 +0200 src: use ToolBoxItem, as all other do Change-Id: I77b0f8a670e4f0a8f75b99662c370b65ce737d3d diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src index 524419b..6e790cd 100644 --- a/sd/source/ui/app/tbxids_tmpl.src +++ b/sd/source/ui/app/tbxids_tmpl.src @@ -20,7 +20,6 @@ #ifndef _TBXIDS_SRC #define _TBXIDS_SRC #define SEPARATOR ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; -#define TBI(x) ToolBoxItem { x }; // Toolbox bar #define TBI_OBJECT_SELECT \ diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src index ca7bd0c..35e36d5 100644 --- a/sd/source/ui/app/toolbox2_tmpl.src +++ b/sd/source/ui/app/toolbox2_tmpl.src @@ -137,14 +137,35 @@ ToolBox RID_DRAW_OBJ_TOOLBOX { TBI_FORMAT_BEZIER_EDIT_RC SEPARATOR - TBI ( ITEM_FORMAT_ATTRIBUTES_LINE ) - TBI ( ITEM_TOOLBAR_ATTR_LINEEND_STYLE ) - TBI ( ITEM_TOOLBAR_ATTR_LINE_STYLE ) - TBI ( ITEM_TOOLBAR_ATTR_LINE_WIDTH ) - TBI ( ITEM_TOOLBAR_ATTR_LINE_COLOR ) + ToolBoxItem + { + ITEM_FORMAT_ATTRIBUTES_LINE + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINEEND_STYLE + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINE_STYLE + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINE_WIDTH + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_LINE_COLOR + }; SEPARATOR - TBI ( ITEM_FORMAT_ATTRIBUTES_AREA ) - TBI ( ITEM_TOOLBAR_ATTR_FILL_STYLE ) + ToolBoxItem + { + ITEM_FORMAT_ATTRIBUTES_AREA + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_FILL_STYLE + }; SEPARATOR TBI_ATTR_FILL_SHADOW TBI_TOGGLECOMMONTASKBAR commit f6698fe54f7d599ed6f7808cdb66c02b533e4c3e Author: Thomas Arnhold <tho...@arnhold.org> Date: Mon Aug 25 18:39:57 2014 +0200 src: capitalization as the rest it's easier to grep Change-Id: I3639467b77c8071f2ffe3204669514948ffff8a2 diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index 5eae415..ae2eccb 100644 --- a/cui/source/customize/acccfg.src +++ b/cui/source/customize/acccfg.src @@ -29,7 +29,7 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX }; String STR_HUMAN_APPNAME { - TEXT = "%PRODUCTNAME" ; + Text = "%PRODUCTNAME" ; }; String STR_GROUP_STYLES { diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src index 4597d95..8173d62 100644 --- a/cui/source/dialogs/cuires.src +++ b/cui/source/dialogs/cuires.src @@ -31,12 +31,12 @@ String RID_SVXSTR_PRODMACROS String RID_SVXSTR_SELECTOR_ADD_COMMANDS { - TEXT [ en-US ] = "Add Commands" ; + Text [ en-US ] = "Add Commands" ; }; String RID_SVXSTR_SELECTOR_RUN { - TEXT [ en-US ] = "Run" ; + Text [ en-US ] = "Run" ; }; String RID_SVXSTR_ROW diff --git a/sd/source/ui/dlg/LayerDialog.src b/sd/source/ui/dlg/LayerDialog.src index 05098c2..3703875 100644 --- a/sd/source/ui/dlg/LayerDialog.src +++ b/sd/source/ui/dlg/LayerDialog.src @@ -43,7 +43,7 @@ DockingWindow FLT_WIN_LAYER_DIALOG Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( WIDTH-2*6, TAB_BAR_HEIGHT ); HelpId = HID_SD_TABBAR_LAYERS; - BORDER = TRUE; + Border = TRUE; SvLook = TRUE; }; }; diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index a564a8e..2dbe170 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.src @@ -268,7 +268,7 @@ String FMT_DDE_NORMAL }; String FLD_INPUT_TEXT { - TEXT = "[Text]" ; + Text = "[Text]" ; }; /*-------------------------------------------------------------------- Description: SubType Extuser @@ -393,19 +393,19 @@ String FMT_CHAPTER_NAMENO --------------------------------------------------------------------*/ String FMT_NUM_ABC { - TEXT = "A B C" ; + Text = "A B C" ; }; String FMT_NUM_SABC { - TEXT = "a b c" ; + Text = "a b c" ; }; String FMT_NUM_ABC_N { - TEXT = "A .. AA .. AAA" ; + Text = "A .. AA .. AAA" ; }; String FMT_NUM_SABC_N { - TEXT = "a .. aa .. aaa" ; + Text = "a .. aa .. aaa" ; }; String FMT_NUM_ROMAN { @@ -563,7 +563,7 @@ String FMT_MARK_OLE --------------------------------------------------------------------*/ String FMT_TEXT { - TEXT = "Text" ; + Text = "Text" ; }; /*-------------------------------------------------------------------- Description: global String resources _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits