This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 09dd143aff9dd1e65210b6e304bdba429195bdc8 Author: mseidel <[email protected]> AuthorDate: Tue Nov 18 13:26:17 2025 +0100 Cleanup resource files (cherry picked from commit cc520948bcf4d71f8568b7bfa7eb84196f116faf) --- .../source/controller/dialogs/tp_ChartType.src | 221 ++++++++++----------- .../dbaccess/source/ui/imagelists/dbimagelists.src | 2 - main/reportdesign/source/ui/dlg/CondFormat.src | 3 +- main/sc/source/ui/src/toolbox.src | 25 +-- main/sw/source/ui/dbui/dbinsdlg.src | 213 ++++++++++---------- main/sw/source/ui/dbui/mailmergechildwindow.src | 1 - main/sw/source/ui/ribbar/workctrl.src | 4 +- main/uui/source/unknownauthdlg.src | 21 +- 8 files changed, 227 insertions(+), 263 deletions(-) diff --git a/main/chart2/source/controller/dialogs/tp_ChartType.src b/main/chart2/source/controller/dialogs/tp_ChartType.src index 4b9ae272c9..ad8ec4dafc 100644 --- a/main/chart2/source/controller/dialogs/tp_ChartType.src +++ b/main/chart2/source/controller/dialogs/tp_ChartType.src @@ -19,7 +19,6 @@ * *************************************************************/ - #include "HelpIds.hrc" #include "tp_ChartType.hrc" #include "SchSlotIds.hxx" @@ -30,8 +29,6 @@ #include <svtools/controldims.hrc> #endif -#define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; } - #define WIDTH_MAINLIST 75 #define HEIGHT_MAINLIST 122 #define WIDTH_IMAGELIST 150 @@ -55,7 +52,7 @@ #define SPLINES_WIDTH_RADIO 45 #define SPLINES_WIDTH_METRIC_TEXT 60 -#define POS_X_SPLINE_EXTRAS (POS_X_SPLINES_1+SPLINES_WIDTH_RADIO+RSC_SP_FLGR_SPACE_X+RSC_CD_FIXEDLINE_WIDTH+2*RSC_SP_FLGR_SPACE_X) +#define POS_X_SPLINE_EXTRAS (POS_X_SPLINES_1+SPLINES_WIDTH_RADIO+RSC_SP_FLGR_SPACE_X+RSC_CD_FIXEDLINE_WIDTH+2*RSC_SP_FLGR_SPACE_X) #define WIZ_FIXEDLINE_WIDTH (CHART_WIZARD_PAGEWIDTH-POS_X_MAINLIST-6) #define WIDTH_XVALUE_SORTING (WIDTH_IMAGELIST) @@ -65,166 +62,164 @@ TabPage TP_CHARTTYPE { Hide = TRUE ; - HelpID = HID_DIAGRAM_TYPE; + HelpID = HID_DIAGRAM_TYPE ; SVLook = TRUE ; - Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; + Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH, CHART_WIZARD_PAGEHEIGHT ) ; - FixedText FT_CHARTTYPE + FixedText FT_CHARTTYPE { - Pos = MAP_APPFONT ( POS_X_MAINLIST-1 , POS_Y1 ) ; - Size = MAP_APPFONT ( WIZ_FIXEDLINE_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( POS_X_MAINLIST-1, POS_Y1 ) ; + Size = MAP_APPFONT ( WIZ_FIXEDLINE_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; TabStop = FALSE ; - Text [ en-US ] = "Choose a chart type"; + Text [ en-US ] = "Choose a chart type" ; }; ListBox LB_CHARTTYPE { HelpId = HID_SCH_CTL_TYPE ; Border = TRUE ; TabStop = TRUE ; - Pos = MAP_APPFONT ( POS_X_MAINLIST , POS_Y_LIST ) ; + Pos = MAP_APPFONT ( POS_X_MAINLIST, POS_Y_LIST ) ; Size = MAP_APPFONT ( WIDTH_MAINLIST, HEIGHT_MAINLIST ) ; }; Control CT_CHARTVARIANT { HelpId = HID_SCH_CTL_VARIANT ; Border = TRUE ; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_LIST ) ; - Size = MAP_APPFONT ( WIDTH_IMAGELIST , HEIGHT_IMAGELIST ) ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_LIST ) ; + Size = MAP_APPFONT ( WIDTH_IMAGELIST, HEIGHT_IMAGELIST ) ; TabStop = TRUE ; }; CheckBox CB_X_AXIS_CATEGORIES { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_VALUE_X_AXIS ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES" ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_VALUE_X_AXIS ) ; + Size = MAP_APPFONT ( 150, 10 ) ; Text [ en-US ] = "X axis with Categories" ; - }; - CheckBox CB_3D_LOOK + }; + CheckBox CB_3D_LOOK { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_3D_LOOK ) ; - Size = MAP_APPFONT ( WIDTH_3D , 10 ) ; + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK" ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_3D_LOOK ) ; + Size = MAP_APPFONT ( WIDTH_3D, 10 ) ; Text [ en-US ] = "~3D Look" ; - }; - ListBox LB_3D_SCHEME + }; + ListBox LB_3D_SCHEME { - HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME"; - Border = TRUE; - TabStop = TRUE; - DropDown = TRUE; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+WIDTH_3D+4 , POS_Y_3D_LOOK ) ; + HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME" ; + Border = TRUE ; + TabStop = TRUE ; + DropDown = TRUE ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST+WIDTH_3D+4, POS_Y_3D_LOOK ) ; Size = MAP_APPFONT ( 60, 12 ) ; }; - CheckBox CB_STACKED + CheckBox CB_STACKED { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_STACKED"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_STACKING ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_STACKED" ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_STACKING ) ; + Size = MAP_APPFONT ( 150, 10 ) ; Text [ en-US ] = "~Stack series" ; - }; - RadioButton RB_STACK_Y + }; + RadioButton RB_STACK_Y { - HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+12 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y" ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+12 ) ; + Size = MAP_APPFONT ( 80, 10 ) ; TabStop = TRUE ; - //Uebereinander (summiere Y-Werte) - //On top (sum Y-values) - Text [ en-US ] = "On top"; - }; - RadioButton RB_STACK_Y_PERCENT + // On top (sum Y-values) + Text [ en-US ] = "On top" ; + }; + RadioButton RB_STACK_Y_PERCENT { - HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+2*12 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT" ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+2*12 ) ; + Size = MAP_APPFONT ( 80, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Percent"; - }; - RadioButton RB_STACK_Z + Text [ en-US ] = "Percent" ; + }; + RadioButton RB_STACK_Z { - HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+3*12 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z" ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+3*12 ) ; + Size = MAP_APPFONT ( 80, 10 ) ; TabStop = TRUE ; - //Hintereinander (verteile Datenreihen auf der Z-Achse) - //Deep (spread series on Z-Axis) - Text [ en-US ] = "Deep"; - }; + // Deep (spread series on Z-Axis) + Text [ en-US ] = "Deep" ; + }; - CheckBox CB_SPLINES + CheckBox CB_SPLINES { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES" ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_SPLINES ) ; + Size = MAP_APPFONT ( 150, 10 ) ; Text [ en-US ] = "S~mooth lines" ; - }; + }; - PushButton PB_SPLINE_DIALOG + PushButton PB_SPLINE_DIALOG { - HelpID = "chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG"; - TabStop = TRUE ; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES-6 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - Text [ en-US ] = "Properties..." ; - }; + HelpID = "chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_SPLINES-6 ) ; + Size = MAP_APPFONT ( 12, 14 ) ; + Text [ en-US ] = "Properties..." ; + }; - CheckBox CB_XVALUE_SORTING - { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_XVALUE_SORTING"; - TabStop = TRUE ; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_XVALUE_SORTING ) ; - Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ; + CheckBox CB_XVALUE_SORTING + { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_XVALUE_SORTING" ; + TabStop = TRUE ; + Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_XVALUE_SORTING ) ; + Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING, 10 ) ; Text [ en-US ] = "~Sort by X values" ; - }; + }; }; ModalDialog DLG_SPLINE_PROPERTIES { - HelpID = HID_SCH_DLG_SPLINE_PROPERTIES; - Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH , SPLINE_DIALOG_HEIGHT ) ; + HelpID = HID_SCH_DLG_SPLINE_PROPERTIES ; + Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH, SPLINE_DIALOG_HEIGHT ) ; OutputSize = TRUE ; SVLook = TRUE ; - Moveable = TRUE ; - Closeable = TRUE; - RadioButton RB_SPLINES_CUBIC + Moveable = TRUE ; + Closeable = TRUE ; + RadioButton RB_SPLINES_CUBIC { - HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC"; - Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_2 ) ; - Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ; + HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC" ; + Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_2 ) ; + Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Cubic spline"; - }; - RadioButton RB_SPLINES_B + Text [ en-US ] = "Cubic spline" ; + }; + RadioButton RB_SPLINES_B { - HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B"; - Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_3 ) ; - Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ; + HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B" ; + Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_3 ) ; + Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "B-Spline"; - }; + Text [ en-US ] = "B-Spline" ; + }; - FixedLine FL_SPLINE_SEPARATOR - { - Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS-RSC_CD_FIXEDLINE_WIDTH-RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_2 ) ; - Size = MAP_APPFONT ( RSC_CD_FIXEDLINE_WIDTH , 2*12 ) ; - Vert = TRUE ; - }; + FixedLine FL_SPLINE_SEPARATOR + { + Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS-RSC_CD_FIXEDLINE_WIDTH-RSC_SP_FLGR_SPACE_X, POS_Y_SPLINES_2 ) ; + Size = MAP_APPFONT ( RSC_CD_FIXEDLINE_WIDTH, 2*12 ) ; + Vert = TRUE ; + }; - FixedText FT_SPLINE_RESOLUTION + FixedText FT_SPLINE_RESOLUTION { - Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS , POS_Y_SPLINES_2 ) ; - Size = MAP_APPFONT ( SPLINES_WIDTH_METRIC_TEXT , 10 ) ; + Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS, POS_Y_SPLINES_2 ) ; + Size = MAP_APPFONT ( SPLINES_WIDTH_METRIC_TEXT, 10 ) ; Text [ en-US ] = "~Resolution" ; }; MetricField MF_SPLINE_RESOLUTION { - HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION"; + HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION" ; Border = TRUE ; - Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_2-2 ) ; - Size = MAP_APPFONT ( 25 , 12 ) ; + Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X, POS_Y_SPLINES_2-2 ) ; + Size = MAP_APPFONT ( 25, 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; @@ -237,18 +232,18 @@ ModalDialog DLG_SPLINE_PROPERTIES SpinSize = 1 ; }; - FixedText FT_SPLINE_ORDER + FixedText FT_SPLINE_ORDER { - Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS , POS_Y_SPLINES_3 ) ; - Size = MAP_APPFONT ( SPLINES_WIDTH_METRIC_TEXT , 10 ) ; - Text [ en-US ] = "~Degree of polynomials" ; + Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS, POS_Y_SPLINES_3 ) ; + Size = MAP_APPFONT ( SPLINES_WIDTH_METRIC_TEXT, 10 ) ; + Text [ en-US ] = "~Degree of polynomials" ; }; MetricField MF_SPLINE_ORDER { - HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER"; + HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER" ; Border = TRUE ; - Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_3-2 ) ; - Size = MAP_APPFONT ( 25 , 12 ) ; + Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X, POS_Y_SPLINES_3-2 ) ; + Size = MAP_APPFONT ( 25, 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; @@ -262,8 +257,10 @@ ModalDialog DLG_SPLINE_PROPERTIES }; FixedLine FL_SPLINE_DIALOGBUTTONS { - Pos = MAP_APPFONT ( 0 , POS_Y_SPLINES_4 ) ; - Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; + Pos = MAP_APPFONT ( 0, POS_Y_SPLINES_4 ) ; + Size = MAP_APPFONT ( SPLINE_DIALOG_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; }; - BUTTONS_HELP_OK_CANCEL_NEXT(POS_X_SPLINES_1,POS_Y_SPLINES_5) + BUTTONS_HELP_OK_CANCEL_NEXT ( POS_X_SPLINES_1, POS_Y_SPLINES_5 ) }; + +// ********************************************************************** EOF diff --git a/main/dbaccess/source/ui/imagelists/dbimagelists.src b/main/dbaccess/source/ui/imagelists/dbimagelists.src index fac7bcdd96..c6948ee023 100644 --- a/main/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/main/dbaccess/source/ui/imagelists/dbimagelists.src @@ -19,8 +19,6 @@ * *************************************************************/ - - #ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" #endif diff --git a/main/reportdesign/source/ui/dlg/CondFormat.src b/main/reportdesign/source/ui/dlg/CondFormat.src index e487df48ae..a0c2087ddd 100644 --- a/main/reportdesign/source/ui/dlg/CondFormat.src +++ b/main/reportdesign/source/ui/dlg/CondFormat.src @@ -336,12 +336,11 @@ ImageList 31000 prefix = "sc" ; IdList = {05500;} ; IdCount = 1 ; - }; ToolBox RID_TB_SORTING { - Pos = MAP_APPFONT ( 0,0 ) ; + Pos = MAP_APPFONT ( 0, 0 ) ; ButtonType = BUTTON_SYMBOL ; Align = BOXALIGN_TOP ; Customize = FALSE ; diff --git a/main/sc/source/ui/src/toolbox.src b/main/sc/source/ui/src/toolbox.src index c6ce01949c..b35814f70c 100644 --- a/main/sc/source/ui/src/toolbox.src +++ b/main/sc/source/ui/src/toolbox.src @@ -19,17 +19,14 @@ * *************************************************************/ - - #include "sc.hrc" // -> #include <sfx.hrc> #include <svx/globlmn.hrc> #include "tbinsert.hrc" // Sub-IDs - // ToolBoxen: ---------------------------------------------------------------- /* - * ToolBox mit Eingabezeile: HelpStrings fuer Knoepfe und Fenster: + * ToolBox mit Eingabezeile: HelpStrings für Knöpfe und Fenster: */ #define ITEM_TOOLBAR_SORT_ASCENDING \ @@ -123,16 +120,16 @@ String SCSTR_QHELP_BTNEQUAL // used in floating windows. #define DEFAULT_IDLIST \ - IdList = { \ - /* Eingabezeile */ \ - SID_INPUT_FUNCTION; /* 20047 */ \ - SID_INPUT_SUM; /* 20048 */ \ - SID_INPUT_EQUAL; /* 20049 */ \ - SID_INPUT_CANCEL; \ - SID_INPUT_OK; \ - }; \ - IdCount = { \ - 5; \ + IdList = { \ + /* Eingabezeile */ \ + SID_INPUT_FUNCTION; /* 20047 */ \ + SID_INPUT_SUM; /* 20048 */ \ + SID_INPUT_EQUAL; /* 20049 */ \ + SID_INPUT_CANCEL; \ + SID_INPUT_OK; \ + }; \ + IdCount = { \ + 5; \ }; ImageList RID_DEFAULTIMAGELIST_SC diff --git a/main/sw/source/ui/dbui/dbinsdlg.src b/main/sw/source/ui/dbui/dbinsdlg.src index 5ba4497d87..41ebf8b6c3 100644 --- a/main/sw/source/ui/dbui/dbinsdlg.src +++ b/main/sw/source/ui/dbui/dbinsdlg.src @@ -19,8 +19,6 @@ * *************************************************************/ - - #include "dbinsdlg.hrc" #include "dbui.hrc" #include "cmdid.h" @@ -29,102 +27,102 @@ ModalDialog DLG_AP_INSERT_DB_SEL { HelpID = HID_AP_INSERT_DB_SEL ; OUTPUTSIZE = TRUE ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 291 , 189 ) ; + Pos = MAP_APPFONT ( 0, 0 ) ; + Size = MAP_APPFONT ( 291, 189 ) ; Moveable = TRUE ; Closeable = TRUE ; SVLOOK = TRUE ; FixedText FT_INSERT_DATA { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 66 , 8 ) ; + Pos = MAP_APPFONT ( 6, 6 ) ; + Size = MAP_APPFONT ( 66, 8 ) ; Text [ en-US ] = "Insert data as:" ; }; RadioButton RB_AS_TABLE { - HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE"; - Pos = MAP_APPFONT ( 80 , 6 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE" ; + Pos = MAP_APPFONT ( 80, 6 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; TabStop = TRUE ; Check = TRUE ; Text [ en-US ] = "T~able" ; }; RadioButton RB_AS_FIELD { - HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD"; - Pos = MAP_APPFONT ( 145 , 6 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD" ; + Pos = MAP_APPFONT ( 145, 6 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~Fields" ; }; RadioButton RB_AS_TEXT { - HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT"; - Pos = MAP_APPFONT ( 210 , 6 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT" ; + Pos = MAP_APPFONT ( 210, 6 ) ; + Size = MAP_APPFONT ( 60, 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~Text" ; }; OKButton BT_OK { - Pos = MAP_APPFONT ( 123 , 172 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 123, 172 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; DefButton = TRUE ; }; CancelButton BT_CANCEL { - Pos = MAP_APPFONT ( 179 , 172 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 179, 172 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; }; HelpButton BT_HELP { - Pos = MAP_APPFONT ( 235 , 172 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Pos = MAP_APPFONT ( 235, 172 ) ; + Size = MAP_APPFONT ( 50, 14 ) ; TabStop = TRUE ; }; - FixedLine FL_HEAD + FixedLine FL_HEAD { - Pos = MAP_APPFONT ( 6 , 19 ) ; - Size = MAP_APPFONT ( 279 , 8 ) ; + Pos = MAP_APPFONT ( 6, 19 ) ; + Size = MAP_APPFONT ( 279, 8 ) ; /* wird dynamisch gesetzt! */ Text = "" ; }; FixedText FT_DB_COLUMN { - Pos = MAP_APPFONT ( 12 , 31 ) ; - Size = MAP_APPFONT ( 72 , 8 ) ; + Pos = MAP_APPFONT ( 12, 31 ) ; + Size = MAP_APPFONT ( 72, 8 ) ; Text [ en-US ] = "Database ~columns" ; }; - FixedLine FL_FORMAT + FixedLine FL_FORMAT { - Pos = MAP_APPFONT ( 6 , 117 ) ; - Size = MAP_APPFONT ( 279 , 8 ) ; + Pos = MAP_APPFONT ( 6, 117 ) ; + Size = MAP_APPFONT ( 279, 8 ) ; Text [ en-US ] = "For~mat" ; }; RadioButton RB_DBFMT_FROM_DB { - HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB"; - Pos = MAP_APPFONT ( 15 , 128 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB" ; + Pos = MAP_APPFONT ( 15, 128 ) ; + Size = MAP_APPFONT ( 90, 10 ) ; TabStop = TRUE ; Check = TRUE ; Text [ en-US ] = "From ~database" ; }; RadioButton RB_DBFMT_FROM_USR { - HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR"; - Pos = MAP_APPFONT ( 15 , 143 ) ; - Size = MAP_APPFONT ( 10 , 10 ) ; + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR" ; + Pos = MAP_APPFONT ( 15, 143 ) ; + Size = MAP_APPFONT ( 10, 10 ) ; TabStop = TRUE ; }; ListBox LB_DBFMT_FROM_USR { - HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR"; + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR" ; Border = TRUE ; - Pos = MAP_APPFONT ( 30 , 142 ) ; - Size = MAP_APPFONT ( 75 , 44 ) ; + Pos = MAP_APPFONT ( 30, 142 ) ; + Size = MAP_APPFONT ( 75, 44 ) ; TabStop = TRUE ; DropDown = TRUE ; AutoHScroll = TRUE ; @@ -132,55 +130,54 @@ ModalDialog DLG_AP_INSERT_DB_SEL /* -------------- Page Text / Fields -------------------------------- */ ListBox LB_TXT_DB_COLUMN { - HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN"; + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN" ; Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 41 ) ; - Size = MAP_APPFONT ( 93 , 70 ) ; + Pos = MAP_APPFONT ( 12, 41 ) ; + Size = MAP_APPFONT ( 93, 70 ) ; TabStop = TRUE ; Hide = TRUE ; }; - ImageButton IB_DBCOL_TOEDIT + ImageButton IB_DBCOL_TOEDIT { - HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT"; - Pos = MAP_APPFONT ( 111 , 41 ) ; - Size = MAP_APPFONT ( 20 , 12 ) ; + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT" ; + Pos = MAP_APPFONT ( 111, 41 ) ; + Size = MAP_APPFONT ( 20, 12 ) ; TabStop = TRUE ; Hide = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap { - File = "one_right.png" ; + File = "one_right.png" ; }; - MaskColor = IMAGE_MASK_COLOR ; }; }; MultiLineEdit ED_DB_TEXT { - HelpID = "sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT"; + HelpID = "sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT" ; Border = TRUE ; - Pos = MAP_APPFONT ( 137 , 41 ) ; - Size = MAP_APPFONT ( 142 , 70 ) ; + Pos = MAP_APPFONT ( 137, 41 ) ; + Size = MAP_APPFONT ( 142, 70 ) ; TabStop = TRUE ; Left = TRUE ; VScroll = TRUE ; HScroll = TRUE ; Hide = TRUE ; - IgnoreTab = TRUE; + IgnoreTab = TRUE ; }; FixedText FT_DB_PARA_COLL { - Pos = MAP_APPFONT ( 118 , 129 ) ; - Size = MAP_APPFONT ( 58 , 8 ) ; + Pos = MAP_APPFONT ( 118, 129 ) ; + Size = MAP_APPFONT ( 58, 8 ) ; Text [ en-US ] = "Paragraph ~Style:" ; Hide = TRUE ; }; ListBox LB_DB_PARA_COLL { - HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL"; + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL" ; Border = TRUE ; - Pos = MAP_APPFONT ( 182 , 127 ) ; - Size = MAP_APPFONT ( 97 , 59 ) ; + Pos = MAP_APPFONT ( 182, 127 ) ; + Size = MAP_APPFONT ( 97, 59 ) ; TabStop = TRUE ; DropDown = TRUE ; Hide = TRUE ; @@ -189,131 +186,127 @@ ModalDialog DLG_AP_INSERT_DB_SEL /* -------------- Page Table ---------------------------------------- */ ListBox LB_TBL_DB_COLUMN { - HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN"; + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN" ; Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 41 ) ; - Size = MAP_APPFONT ( 93 , 70 ) ; + Pos = MAP_APPFONT ( 12, 41 ) ; + Size = MAP_APPFONT ( 93, 70 ) ; TabStop = TRUE ; }; - ImageButton IB_DBCOL_ALL_TO + ImageButton IB_DBCOL_ALL_TO { - HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO"; - Pos = MAP_APPFONT ( 111 , 41 ) ; - Size = MAP_APPFONT ( 20 , 12 ) ; + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO" ; + Pos = MAP_APPFONT ( 111, 41 ) ; + Size = MAP_APPFONT ( 20, 12 ) ; TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap { - File = "all_right.png" ; + File = "all_right.png" ; }; - MaskColor = IMAGE_MASK_COLOR ; }; }; - ImageButton IB_DBCOL_ONE_TO + ImageButton IB_DBCOL_ONE_TO { - HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO"; - Pos = MAP_APPFONT ( 111 , 56 ) ; - Size = MAP_APPFONT ( 20 , 12 ) ; + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO" ; + Pos = MAP_APPFONT ( 111, 56 ) ; + Size = MAP_APPFONT ( 20, 12 ) ; TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap { - File = "one_right.png" ; + File = "one_right.png" ; }; - MaskColor = IMAGE_MASK_COLOR ; }; }; - ImageButton IB_DBCOL_ONE_FROM + ImageButton IB_DBCOL_ONE_FROM { - HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM"; - Pos = MAP_APPFONT ( 111 , 84 ) ; - Size = MAP_APPFONT ( 20 , 12 ) ; + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM" ; + Pos = MAP_APPFONT ( 111, 84 ) ; + Size = MAP_APPFONT ( 20, 12 ) ; TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap { - File = "one_left.png" ; + File = "one_left.png" ; }; - MaskColor = IMAGE_MASK_COLOR ; }; }; - ImageButton IB_DBCOL_ALL_FROM + ImageButton IB_DBCOL_ALL_FROM { - HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM"; - Pos = MAP_APPFONT ( 111 , 99 ) ; - Size = MAP_APPFONT ( 20 , 12 ) ; + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM" ; + Pos = MAP_APPFONT ( 111, 99 ) ; + Size = MAP_APPFONT ( 20, 12 ) ; TabStop = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap { - File = "all_left.png" ; + File = "all_left.png" ; }; - MaskColor = IMAGE_MASK_COLOR ; }; }; FixedText FT_TABLE_COL { - Pos = MAP_APPFONT ( 137 , 31 ) ; - Size = MAP_APPFONT ( 75 , 8 ) ; + Pos = MAP_APPFONT ( 137, 31 ) ; + Size = MAP_APPFONT ( 75, 8 ) ; Text [ en-US ] = "Tab~le column(s)" ; }; ListBox LB_TABLE_COL { - HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL"; + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL" ; Border = TRUE ; - Pos = MAP_APPFONT ( 137 , 41 ) ; - Size = MAP_APPFONT ( 75 , 70 ) ; + Pos = MAP_APPFONT ( 137, 41 ) ; + Size = MAP_APPFONT ( 75, 70 ) ; TabStop = TRUE ; }; - FixedLine FL_BOTTOM + FixedLine FL_BOTTOM { - Pos = MAP_APPFONT ( 0 , 164 ) ; - Size = MAP_APPFONT ( 291, 8 ) ; + Pos = MAP_APPFONT ( 0, 164 ) ; + Size = MAP_APPFONT ( 291, 8 ) ; }; CheckBox CB_TABLE_HEADON { - HelpID = "sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON"; - Pos = MAP_APPFONT ( 111 , 128 ) ; - Size = MAP_APPFONT ( 100 , 10 ) ; + HelpID = "sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON" ; + Pos = MAP_APPFONT ( 111, 128 ) ; + Size = MAP_APPFONT ( 100, 10 ) ; TabStop = TRUE ; Check = TRUE ; - Text [ en-US ] = "Insert table heading"; + Text [ en-US ] = "Insert table heading" ; }; RadioButton RB_HEADL_COLNMS { - HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS"; - Pos = MAP_APPFONT ( 120 , 142 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS" ; + Pos = MAP_APPFONT ( 120, 142 ) ; + Size = MAP_APPFONT ( 90, 10 ) ; TabStop = TRUE ; Check = TRUE ; - Text [ en-US ] = "Apply column ~name"; + Text [ en-US ] = "Apply column ~name" ; }; RadioButton RB_HEADL_EMPTY { - HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY"; - Pos = MAP_APPFONT ( 120 , 155 ) ; - Size = MAP_APPFONT ( 90 , 10 ) ; + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY" ; + Pos = MAP_APPFONT ( 120, 155 ) ; + Size = MAP_APPFONT ( 90, 10 ) ; TabStop = TRUE ; - Text [ en-US ] = "Create row only"; + Text [ en-US ] = "Create row only" ; }; PushButton PB_TBL_FORMAT { - HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT"; - Pos = MAP_APPFONT ( 214 , 128 ) ; - Size = MAP_APPFONT ( 65 , 12 ) ; + HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT" ; + Pos = MAP_APPFONT ( 214, 128 ) ; + Size = MAP_APPFONT ( 65, 12 ) ; Text [ en-US ] = "Pr~operties..." ; TabStop = TRUE ; }; PushButton PB_TBL_AUTOFMT { - HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT"; - Pos = MAP_APPFONT ( 214 , 144 ) ; - Size = MAP_APPFONT ( 65 , 12 ) ; + HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT" ; + Pos = MAP_APPFONT ( 214, 144 ) ; + Size = MAP_APPFONT ( 65, 12 ) ; TabStop = TRUE ; Text [ en-US ] = "Aut~oFormat..." ; }; @@ -323,3 +316,5 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; Text [ en-US ] = "Insert Database Columns" ; }; + +// ********************************************************************** EOF diff --git a/main/sw/source/ui/dbui/mailmergechildwindow.src b/main/sw/source/ui/dbui/mailmergechildwindow.src index f2777b5274..17086eae64 100644 --- a/main/sw/source/ui/dbui/mailmergechildwindow.src +++ b/main/sw/source/ui/dbui/mailmergechildwindow.src @@ -30,7 +30,6 @@ #define WORKAROUND \ Text [ en-US ] = "Return to Mail Merge Wizard" ; \ - FloatingWindow DLG_MAILMERGECHILD\ { OutputSize = TRUE ; diff --git a/main/sw/source/ui/ribbar/workctrl.src b/main/sw/source/ui/ribbar/workctrl.src index 07b89667aa..d6bb1112bb 100644 --- a/main/sw/source/ui/ribbar/workctrl.src +++ b/main/sw/source/ui/ribbar/workctrl.src @@ -19,8 +19,6 @@ * *************************************************************/ - - #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> #endif @@ -247,7 +245,7 @@ Noch ein paar Reserven */ /*************************************************************** - Quickhelp strings for View-Up/Down buttons + Quickhelp strings for View-Up/Down buttons ***************************************************************/ String STR_IMGBTN_NEXT_DOWN { diff --git a/main/uui/source/unknownauthdlg.src b/main/uui/source/unknownauthdlg.src index bb6a5edcdc..14a84b69cd 100644 --- a/main/uui/source/unknownauthdlg.src +++ b/main/uui/source/unknownauthdlg.src @@ -37,10 +37,8 @@ ModalDialog DLG_UUI_UNKNOWNAUTH SVLook = TRUE ; Pos = MAP_APPFONT ( 136, 79 ) ; Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGHT ) ; - Text [ en-US ] = "Website Certified by an Unknown Authority" ; - FixedImage IMG_WARN { Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP ) ; @@ -49,9 +47,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH Fixed = Image { /* ImageBitmap = Bitmap { File = "certificate_40x56.png"; }; */ - MaskColor = Color{Red=0xffff;Green=0x0000;Blue=0xffff;} ; }; - }; @@ -60,18 +56,14 @@ ModalDialog DLG_UUI_UNKNOWNAUTH HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE" ; Pos = MAP_APPFONT ( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y ) ; Size = MAP_APPFONT ( 70, RSC_CD_PUSHBUTTON_HEIGHT ) ; - Text [ en-US ] = "Examine Certificate..." ; - }; HelpButton PB_HELP { Pos = MAP_APPFONT ( DLG_CTLBTN_HELP_START_X, DLG_CTLBTN_START_Y ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ; - Text [ en-US ] = "Help" ; - }; PushButton PB_OK @@ -79,16 +71,13 @@ ModalDialog DLG_UUI_UNKNOWNAUTH HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK" ; Pos = MAP_APPFONT ( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ; - Text [ en-US ] = "OK" ; - }; CancelButton PB_CANCEL { Pos = MAP_APPFONT ( DLG_CTLBTN_CANCEL_START_X, DLG_CTLBTN_START_Y ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ; - }; RadioButton RB_ACCEPT_1 @@ -96,10 +85,8 @@ ModalDialog DLG_UUI_UNKNOWNAUTH HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_ACCEPT_1" ; Pos = MAP_APPFONT ( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y ) ; Size = MAP_APPFONT ( 182, RSC_CD_RADIOBUTTON_HEIGHT ) ; - Text [ en-US ] = "Accept this certificate temporarily for this session" ; - - Check = TRUE; + Check = TRUE ; }; RadioButton RB_DONTACCEPT_2 @@ -107,21 +94,16 @@ ModalDialog DLG_UUI_UNKNOWNAUTH HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_DONTACCEPT_2" ; Pos = MAP_APPFONT ( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y + RSC_CD_RADIOBUTTON_HEIGHT ) ; Size = MAP_APPFONT ( 182, RSC_CD_RADIOBUTTON_HEIGHT ) ; - Text [ en-US ] = "Do not accept this certificate and do not connect to this Web site" ; - }; FixedText FT_LABEL_1 { Pos = MAP_APPFONT ( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP ) ; Size = MAP_APPFONT ( 190, DLG_TEXT_1_HEIGHT ) ; - Text [ en-US ] = "No Text" ; - Border = FALSE ; WordBreak = TRUE ; - }; FixedLine FL_LINE @@ -129,7 +111,6 @@ ModalDialog DLG_UUI_UNKNOWNAUTH Pos = MAP_APPFONT ( 0, DLG_CTLBTN_START_Y - RSC_SP_FLGR_INNERBORDER_TOP - RSC_CD_FIXEDLINE_HEIGHT ) ; Size = MAP_APPFONT ( DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; }; - }; // ********************************************************************** EOF
