diff options
| author | Joseph Powers <jpowers27@cox.net> | 2010-11-21 07:59:32 -0800 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2010-11-21 07:59:32 -0800 |
| commit | 6134bb32a5ccabb9bf8cc7dbe5334c925f063ba9 (patch) | |
| tree | e14f2503ddc2bd6823e2a77eee68aa25240ce151 | |
| parent | ee67ae67d8c68f8c5a7d9a8870c4d0357f1d1f78 (diff) | |
.src cleanup and .png fixes
41 files changed, 48 insertions, 1232 deletions
diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src index 4b4cec65426e..cf189b1b82bf 100644 --- a/chart2/source/controller/dialogs/Strings.src +++ b/chart2/source/controller/dialogs/Strings.src @@ -121,11 +121,6 @@ String STR_PAGE_POSITIONING Text [ en-US ] = "Positioning" ; }; -// String STR_PAGE_STATISTICS -// { -// Text [ en-US ] = "Statistics" ; -// }; - String STR_PAGE_TRENDLINE_TYPE { Text[ en-US ] = "Type"; diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src index 9efbfe0f557f..9396b862d2f3 100644 --- a/sc/source/ui/dbgui/asciiopt.src +++ b/sc/source/ui/dbgui/asciiopt.src @@ -258,48 +258,3 @@ ModalDialog RID_SCDLG_ASCII Text [ en-US ] = "Text to Columns" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src index 5cf1dacad819..3c03150e400b 100644 --- a/sc/source/ui/dbgui/dapitype.src +++ b/sc/source/ui/dbgui/dapitype.src @@ -285,24 +285,3 @@ ModalDialog RID_SCDLG_DAPIDATA }; Text [ en-US ] = "Select Data Source"; }; - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src index 914f2d1fb027..3761faf18795 100644 --- a/sc/source/ui/dbgui/imoptdlg.src +++ b/sc/source/ui/dbgui/imoptdlg.src @@ -128,14 +128,3 @@ ModalDialog RID_SCDLG_IMPORTOPT - - - - - - - - - - - diff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src index 40cfeb01b8ff..eb8e18532531 100644 --- a/sc/source/ui/dbgui/scendlg.src +++ b/sc/source/ui/dbgui/scendlg.src @@ -155,41 +155,3 @@ ModalDialog RID_SCDLG_NEWSCENARIO Text [ en-US ] = "Settings"; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src index 69e2d69b3142..ad0a417c5519 100644 --- a/sc/source/ui/dbgui/textimportoptions.src +++ b/sc/source/ui/dbgui/textimportoptions.src @@ -107,4 +107,3 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS Text [ en-US ] = "Detect special numbers (such as dates)." ; }; }; - diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src index c861fbc200cb..0e1ea8403132 100644 --- a/sc/source/ui/dbgui/validate.src +++ b/sc/source/ui/dbgui/validate.src @@ -27,7 +27,6 @@ #include "validate.hrc" - TabDialog TAB_DLG_VALIDATION { OutputSize = TRUE ; @@ -62,9 +61,9 @@ TabDialog TAB_DLG_VALIDATION }; Text [ en-US ] = "Validity" ; }; -//<!--Added by PengYunQuan for Validity Cell Range Picker + #define OFFSET_X 30 -//-->Added by PengYunQuan for Validity Cell Range Picker + TabPage TP_VALIDATION_VALUES { Hide = TRUE ; @@ -74,19 +73,13 @@ TabPage TP_VALIDATION_VALUES FixedText FT_ALLOW { Pos = MAP_APPFONT ( 6 , 16 ) ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Size = MAP_APPFONT ( 70 , 8 ) ; Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Text [ en-US ] = "~Allow" ; }; ListBox LB_ALLOW { Border = TRUE ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 80 , 14 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 14 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Size = MAP_APPFONT ( 90 , 80 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -105,19 +98,13 @@ TabPage TP_VALIDATION_VALUES FixedText FT_VALUE { Pos = MAP_APPFONT ( 6 , 58 ) ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Size = MAP_APPFONT ( 70 , 8 ) ; Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Text [ en-US ] = "~Data" ; }; ListBox LB_VALUE { Border = TRUE ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 80 , 56 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 56 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Size = MAP_APPFONT ( 90 , 90 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -137,81 +124,54 @@ TabPage TP_VALIDATION_VALUES FixedText FT_MIN { Pos = MAP_APPFONT ( 6 , 76 ) ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Size = MAP_APPFONT ( 70 , 8 ) ; Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Text [ en-US ] = "~Minimum" ; }; Edit EDT_MIN { Border = TRUE ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 80 , 74 ) ; - //Size = MAP_APPFONT ( 174 , 12 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 74 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker TabStop = TRUE ; }; MultiLineEdit EDT_LIST { Border = TRUE ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 80 , 74 ) ; - //Size = MAP_APPFONT ( 174 , 105 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 74 ) ; Size = MAP_APPFONT ( 174 + OFFSET_X , 105 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker VScroll = TRUE ; IgnoreTab = TRUE ; }; FixedText FT_MAX { Pos = MAP_APPFONT ( 6 , 92 ) ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Size = MAP_APPFONT ( 70 , 8 ) ; Size = MAP_APPFONT ( 70 - OFFSET_X , 8 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Text [ en-US ] = "Ma~ximum" ; }; Edit EDT_MAX { Border = TRUE ; - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 80 , 90 ) ; - //Size = MAP_APPFONT ( 174 , 12 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 90 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker TabStop = TRUE ; }; CheckBox TSB_ALLOW_BLANKS { - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 80 , 30 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 30 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Size = MAP_APPFONT ( 174 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Allow ~blank cells" ; }; CheckBox CB_SHOWLIST { - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 80 , 44 ) ; Pos = MAP_APPFONT ( 80 - OFFSET_X , 44 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Size = MAP_APPFONT ( 174 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Show selection ~list" ; }; CheckBox CB_SORTLIST { - //<!--Modified by PengYunQuan for Validity Cell Range Picker - //Pos = MAP_APPFONT ( 90 , 58 ) ; Pos = MAP_APPFONT ( 90 - OFFSET_X , 58 ) ; - //-->Modified by PengYunQuan for Validity Cell Range Picker Size = MAP_APPFONT ( 164 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Sor~t entries ascending" ; @@ -223,7 +183,6 @@ TabPage TP_VALIDATION_VALUES WordBreak = TRUE ; Text [ en-US ] = "A valid source can only consist of a contiguous selection of rows and columns, or a formula that results in an area or array."; }; - //<!--Added by PengYunQuan for Validity Cell Range Picker ImageButton RB_VALIDITY_REF { Pos = MAP_APPFONT ( 142 , 73 ) ; @@ -231,7 +190,6 @@ TabPage TP_VALIDATION_VALUES TabStop = TRUE ; QuickHelpText [ en-US ] = "Shrink" ; }; - //-->Added by PengYunQuan for Validity Cell Range Picker }; TabPage TP_VALIDATION_INPUTHELP @@ -360,48 +318,3 @@ TabPage TP_VALIDATION_ERROR }; Text [ en-US ] = "Error Alert" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src index 7226da4642c3..3ee5b91a7b2e 100644 --- a/sc/source/ui/docshell/tpstat.src +++ b/sc/source/ui/docshell/tpstat.src @@ -77,36 +77,3 @@ TabPage RID_SCPAGE_STAT Text [ en-US ] = "Document: " ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index 65e98eea7b2c..751c2ea86db5 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -216,35 +216,3 @@ Menu RID_POPUP_DRAWFORM ITEM_GROUP_MENU }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/formdlg/dwfunctr.src b/sc/source/ui/formdlg/dwfunctr.src index 6f8a054dd6ff..46061a512955 100644 --- a/sc/source/ui/formdlg/dwfunctr.src +++ b/sc/source/ui/formdlg/dwfunctr.src @@ -27,6 +27,7 @@ // include --------------------------------------------------------------- #include "sc.hrc" #include "dwfunctr.hrc" + // pragma ---------------------------------------------------------------- // RID_SVXDLG_CALCFUNC -------------------------------------------------- @@ -110,7 +111,7 @@ DockingWindow FID_FUNCTION_BOX { ImageBitmap = Bitmap { - File = "fx.bmp" ; + File = "fx.png"; }; MaskColor = STD_MASKCOLOR; }; @@ -120,36 +121,3 @@ DockingWindow FID_FUNCTION_BOX Text [ en-US ] = "Functions" ; }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/formdlg/formdlgs.src b/sc/source/ui/formdlg/formdlgs.src index e3550030c74e..3d09f22ef985 100644 --- a/sc/source/ui/formdlg/formdlgs.src +++ b/sc/source/ui/formdlg/formdlgs.src @@ -26,4 +26,5 @@ ************************************************************************/ #include "sc.hrc" + //--------------------------------------------------------------------------- diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src index 4baa9f3d388c..07ae0398134f 100644 --- a/sc/source/ui/miscdlgs/acredlin.src +++ b/sc/source/ui/miscdlgs/acredlin.src @@ -26,6 +26,7 @@ ************************************************************************/ #include "acredlin.hrc" + ModelessDialog RID_SCDLG_CHANGES { OutputSize = TRUE ; @@ -140,22 +141,23 @@ ModelessDialog RID_SCDLG_CHANGES }; Bitmap BMP_STR_CLOSE { - File = "dir-clos.bmp" ; + File = "dir-clos.png" ; }; Bitmap BMP_STR_OPEN { - File = "dir-open.bmp" ; + File = "dir-open.png" ; }; Bitmap BMP_STR_END { - File = "basobj2.bmp" ; + File = "basobj2.png" ; }; Bitmap BMP_STR_ERROR { - File = "basbrk.bmp" ; + File = "basbrk.png" ; }; Text [ en-US ] = "Accept or Reject Changes" ; }; + Menu RID_POPUP_CHANGES { ItemList = @@ -215,44 +217,3 @@ Menu RID_POPUP_CHANGES }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src index 1facf85da95b..2e7bb6b93503 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.src +++ b/sc/source/ui/miscdlgs/conflictsdlg.src @@ -106,4 +106,3 @@ ModalDialog RID_SCDLG_CONFLICTS Text [ en-US ] = "Unknown User" ; }; }; - diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index a244a3e2a44e..259afee9a5be 100644 --- a/sc/source/ui/miscdlgs/highred.src +++ b/sc/source/ui/miscdlgs/highred.src @@ -100,34 +100,3 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES }; Text [ en-US ] = "Show Changes" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src index 6f64c0de1d62..d8432c0b505e 100644 --- a/sc/source/ui/miscdlgs/instbdlg.src +++ b/sc/source/ui/miscdlgs/instbdlg.src @@ -146,39 +146,3 @@ ModalDialog RID_SCDLG_INSERT_TABLE Size = MAP_APPFONT ( 192 , 8 ) ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src index 794af9d43ebd..4d19d1e6a130 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.src +++ b/sc/source/ui/miscdlgs/retypepassdlg.src @@ -27,7 +27,6 @@ #include "retypepassdlg.hrc" - ModalDialog RID_SCDLG_RETYPEPASS { Text [ en-US ] = "Re-type Password" ; diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index d461196ea14e..7b05c8494deb 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -246,19 +246,19 @@ ImageList RID_IMAGELIST_NAVCONT }; Image RID_IMG_DROP_URL { - ImageBitmap = Bitmap { File = "dropurl.bmp" ; }; + ImageBitmap = Bitmap { File = "dropurl.png" ; }; MaskColor = STD_MASKCOLOR ; }; Image RID_IMG_DROP_LINK { - ImageBitmap = Bitmap { File = "droplink.bmp" ; }; + ImageBitmap = Bitmap { File = "droplink.png" ; }; MaskColor = STD_MASKCOLOR ; }; Image RID_IMG_DROP_COPY { - ImageBitmap = Bitmap { File = "dropcopy.bmp" ; }; + ImageBitmap = Bitmap { File = "dropcopy.png" ; }; MaskColor = STD_MASKCOLOR ; }; diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src index 339be43279f2..b82497877763 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.src +++ b/sc/source/ui/pagedlg/hfedtdlg.src @@ -81,6 +81,7 @@ TabDialog RID_SCDLG_HFED_HEADER }; }; }; + TabDialog RID_SCDLG_HFED_FOOTER { OutputSize = TRUE ; @@ -112,6 +113,7 @@ TabDialog RID_SCDLG_HFED_FOOTER }; }; }; + //------------------------------------------------------------------------ // Bearbeiten/Kopf-Fusszeile: //------------------------------------------------------------------------ @@ -158,6 +160,7 @@ TabDialog RID_SCDLG_HFEDIT_ALL }; }; }; + TabDialog RID_SCDLG_HFEDIT_SHDR { OutputSize = TRUE ; @@ -195,6 +198,7 @@ TabDialog RID_SCDLG_HFEDIT_SHDR }; }; }; + TabDialog RID_SCDLG_HFEDIT_SFTR { OutputSize = TRUE ; @@ -232,6 +236,7 @@ TabDialog RID_SCDLG_HFEDIT_SFTR }; }; }; + TabDialog RID_SCDLG_HFEDIT { OutputSize = TRUE ; @@ -263,6 +268,7 @@ TabDialog RID_SCDLG_HFEDIT }; }; }; + TabDialog RID_SCDLG_HFEDIT_HEADER { OutputSize = TRUE ; @@ -294,6 +300,7 @@ TabDialog RID_SCDLG_HFEDIT_HEADER }; }; }; + TabDialog RID_SCDLG_HFEDIT_FOOTER { OutputSize = TRUE ; @@ -325,6 +332,7 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER }; }; }; + TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER { OutputSize = TRUE ; @@ -350,6 +358,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER }; }; }; + TabDialog RID_SCDLG_HFEDIT_LEFTHEADER { OutputSize = TRUE ; @@ -375,6 +384,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER }; }; }; + TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER { OutputSize = TRUE ; @@ -400,6 +410,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER }; }; }; + TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER { OutputSize = TRUE ; @@ -425,6 +436,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER }; }; }; + //------------------------------------------------------------------------ // ScTpHFEdit //------------------------------------------------------------------------ @@ -440,45 +452,18 @@ TabPage RID_HFBASE Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "~Left area" ; }; - /* "Control" braucht eigene HelpId, darum in der Ableitung: - Control WND_LEFT - { - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 18 ) ; - Size = MAP_APPFONT ( 80 , 72 ) ; - TabStop = TRUE ; - }; -*/ FixedText FT_CENTER { Pos = MAP_APPFONT ( 90 , 6 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "~Center area" ; }; - /* "Control" braucht eigene HelpId, darum in der Ableitung: - Control WND_CENTER - { - Border = TRUE ; - Pos = MAP_APPFONT ( 90 , 18 ) ; - Size = MAP_APPFONT ( 80 , 72 ) ; - TabStop = TRUE ; - }; -*/ FixedText FT_RIGHT { Pos = MAP_APPFONT ( 174 , 6 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "R~ight area" ; }; - /* "Control" braucht eigene HelpId, darum in der Ableitung: - Control WND_RIGHT - { - Border = TRUE ; - Pos = MAP_APPFONT ( 174 , 18 ) ; - Size = MAP_APPFONT ( 80 , 72 ) ; - TabStop = TRUE ; - }; -*/ FixedText FT_HF_DEFINED { Pos = MAP_APPFONT ( 12 , 102 ) ; @@ -486,17 +471,6 @@ TabPage RID_HFBASE Text [ en-US ] = "Hea~der" ; }; - /* #i84123# list box needs own help id, which is set in the derived tab pages - ListBox LB_DEFINED - { - Border = TRUE ; - Pos = MAP_APPFONT ( 90 , 100 ) ; - Size = MAP_APPFONT ( 130 , 80 ) ; - DropDown = TRUE ; - TabStop = TRUE ; - }; - */ - FixedText FT_HF_CUSTOM { Pos = MAP_APPFONT ( 12 , 124 ) ; @@ -513,7 +487,7 @@ TabPage RID_HFBASE QuickHelpText [ en-US ] = "Text Attributes" ; ButtonImage = Image { - ImageBitmap = Bitmap { File = "text.bmp" ; }; + ImageBitmap = Bitmap { File = "text.png" ; }; MaskColor = STD_MASKCOLOR ; }; }; @@ -527,7 +501,7 @@ TabPage RID_HFBASE QuickHelpText [ en-US ] = "Title" ; ButtonImage = Image { - ImageBitmap = Bitmap { File = "file.bmp" ; }; + ImageBitmap = Bitmap { File = "file.png" ; }; MaskColor = STD_MASKCOLOR ; }; }; @@ -568,7 +542,7 @@ TabPage RID_HFBASE QuickHelpText [ en-US ] = "Sheet Name" ; ButtonImage = Image { - ImageBitmap = Bitmap { File = "table.bmp" ; }; + ImageBitmap = Bitmap { File = "table.png" ; }; MaskColor = STD_MASKCOLOR; }; }; @@ -582,7 +556,7 @@ TabPage RID_HFBASE QuickHelpText [ en-US ] = "Page" ; ButtonImage = Image { - ImageBitmap = Bitmap { File = "page.bmp" ; }; + ImageBitmap = Bitmap { File = "page.png" ; }; MaskColor = STD_MASKCOLOR ; }; }; @@ -596,7 +570,7 @@ TabPage RID_HFBASE QuickHelpText [ en-US ] = "Pages" ; ButtonImage = Image { - ImageBitmap = Bitmap { File = "pages.bmp" ; }; + ImageBitmap = Bitmap { File = "pages.png" ; }; MaskColor = STD_MASKCOLOR ; }; }; @@ -610,7 +584,7 @@ TabPage RID_HFBASE QuickHelpText [ en-US ] = "Date" ; ButtonImage = Image { - ImageBitmap = Bitmap { File = "date.bmp" ; }; + ImageBitmap = Bitmap { File = "date.png" ; }; MaskColor = STD_MASKCOLOR ; }; }; @@ -624,7 +598,7 @@ TabPage RID_HFBASE QuickHelpText [ en-US ] = "Time" ; ButtonImage = Image { - ImageBitmap = Bitmap { File = "time.bmp" ; }; + ImageBitmap = Bitmap { File = "time.png" ; }; MaskColor = STD_MASKCOLOR ; }; }; @@ -643,6 +617,7 @@ TabPage RID_HFBASE Text [ en-US ] = "Note" ; }; }; + // Kombinationen: Header/Footer links/rechts // die Eingabefenster jeweils mit eigener ID, sonst aus RID_HFBASE kopiert TabPage RID_SCPAGE_HFED_HL < RID_HFBASE @@ -683,6 +658,7 @@ TabPage RID_SCPAGE_HFED_HL < RID_HFBASE TabStop = TRUE ; }; }; + TabPage RID_SCPAGE_HFED_HR < RID_HFBASE { Hide = TRUE ; @@ -721,6 +697,7 @@ TabPage RID_SCPAGE_HFED_HR < RID_HFBASE TabStop = TRUE ; }; }; + TabPage RID_SCPAGE_HFED_FL < RID_HFBASE { Hide = TRUE ; @@ -759,6 +736,7 @@ TabPage RID_SCPAGE_HFED_FL < RID_HFBASE TabStop = TRUE ; }; }; + TabPage RID_SCPAGE_HFED_FR < RID_HFBASE { Hide = TRUE ; @@ -797,4 +775,3 @@ TabPage RID_SCPAGE_HFED_FR < RID_HFBASE TabStop = TRUE ; }; }; - diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src index abaa3ae4cbb2..d02432d94cd9 100644 --- a/sc/source/ui/pagedlg/pagedlg.src +++ b/sc/source/ui/pagedlg/pagedlg.src @@ -25,6 +25,7 @@ * ************************************************************************/ #include "pagedlg.hrc" + ModelessDialog RID_SCDLG_AREAS { HelpId = HID_SCPAGE_AREAS ; @@ -147,6 +148,7 @@ ModelessDialog RID_SCDLG_AREAS QuickHelpText [ en-US ] = "Shrink" ; }; }; + TabPage RID_SCPAGE_TABLE { Hide = TRUE ; @@ -237,12 +239,12 @@ TabPage RID_SCPAGE_TABLE }; Image IMG_LEFTRIGHT { - ImageBitmap = Bitmap { File = "lftrgt.bmp" ; }; + ImageBitmap = Bitmap { File = "lftrgt.png" ; }; MaskColor = STD_MASKCOLOR; }; Image IMG_TOPDOWN { - ImageBitmap = Bitmap { File = "topdown.bmp" ; }; + ImageBitmap = Bitmap { File = "topdown.png" ; }; MaskColor = STD_MASKCOLOR; }; CheckBox BTN_PAGENO @@ -379,28 +381,3 @@ TabPage RID_SCPAGE_TABLE Text [ en-US ] = "Scale" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.src index b2f59e06da72..d1d7396d8829 100644 --- a/sc/source/ui/pagedlg/tphf.src +++ b/sc/source/ui/pagedlg/tphf.src @@ -35,30 +35,3 @@ PushButton RID_SCBTN_HFEDIT Text [ en-US ] = "~Edit..." ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src index ae130f7e8a96..bcdf62261fc2 100644 --- a/sc/source/ui/src/attrdlg.src +++ b/sc/source/ui/src/attrdlg.src @@ -162,42 +162,3 @@ TabPage RID_SCPAGE_PROTECTION Text [ en-US ] = "Print" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src index cb56f6ac85a4..98261b94ef15 100644 --- a/sc/source/ui/src/autofmt.src +++ b/sc/source/ui/src/autofmt.src @@ -169,8 +169,6 @@ ModalDialog RID_SCDLG_AUTOFORMAT String STR_ADD_TITLE { /* ### ACHTUNG: Neuer Text in Resource? AutoFormat hinzufügen : Autoformat hinzufügen */ - /* ### ACHTUNG: Neuer Text in Resource? AutoFormat hinzufügen : Autoformat hinzufügen */ - /* ### ACHTUNG: Neuer Text in Resource? AutoFormat hinzufügen : AutoFormat hinzuf³gen */ Text [ en-US ] = "Add AutoFormat" ; }; @@ -229,43 +227,3 @@ ModalDialog RID_SCDLG_AUTOFORMAT Text [ en-US ] = "Total" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src index 3018cc867e0d..8b73bd52e86b 100644 --- a/sc/source/ui/src/condfrmt.src +++ b/sc/source/ui/src/condfrmt.src @@ -26,6 +26,7 @@ ************************************************************************/ #include "condfrmt.hrc" + ModelessDialog RID_SCDLG_CONDFORMAT { OutputSize = TRUE ; @@ -357,42 +358,3 @@ ModelessDialog RID_SCDLG_CONDFORMAT }; Text [ en-US ] = "Conditional Formatting" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/crnrdlg.src b/sc/source/ui/src/crnrdlg.src index b16a3506bf7b..f3560abede75 100644 --- a/sc/source/ui/src/crnrdlg.src +++ b/sc/source/ui/src/crnrdlg.src @@ -25,6 +25,7 @@ * ************************************************************************/ #include "crnrdlg.hrc" + ModelessDialog RID_SCDLG_COLROWNAMERANGES { OutputSize = TRUE ; @@ -131,36 +132,3 @@ ModelessDialog RID_SCDLG_COLROWNAMERANGES }; Text [ en-US ] = "Define Label Range" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src index 50152d95d9d5..c88491341310 100644 --- a/sc/source/ui/src/dbnamdlg.src +++ b/sc/source/ui/src/dbnamdlg.src @@ -175,24 +175,3 @@ ModelessDialog RID_SCDLG_DBNAMES Text [ en-US ] = "Invalid range" ; }; }; - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index a3fd6d5b7116..9c5caaee81d1 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -27,8 +27,6 @@ #include "globstr.hrc" #include "sc.hrc" - - Resource RID_GLOBSTR { String STR_UNDO_INSERTCELLS diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index e4a82d38ec98..91d83fb3aa13 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -217,40 +217,3 @@ Menu RID_POPUP_COLHEADER }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src index 6d4761c8589c..5793d4237790 100644 --- a/sc/source/ui/src/miscdlgs.src +++ b/sc/source/ui/src/miscdlgs.src @@ -90,6 +90,7 @@ ModalDialog RID_SCDLG_DELCELL Text [ en-US ] = "Selection" ; }; }; + ModalDialog RID_SCDLG_INSCELL { OutputSize = TRUE ; @@ -432,6 +433,7 @@ ModalDialog RID_SCDLG_INSCONT Size = MAP_APPFONT( 1 , 38 ) ; }; }; + ModalDialog RID_SCDLG_MOVETAB { OutputSize = TRUE ; @@ -499,6 +501,7 @@ ModalDialog RID_SCDLG_MOVETAB Text [ en-US ] = "- new document -" ; }; }; + ModalDialog RID_SCDLG_STRINPUT { OutputSize = TRUE ; @@ -538,6 +541,7 @@ ModalDialog RID_SCDLG_STRINPUT Size = MAP_APPFONT ( 110 , 8 ) ; }; }; + ModalDialog RID_SCDLG_TAB_BG_COLOR { OutputSize = TRUE ; @@ -582,105 +586,6 @@ ModalDialog RID_SCDLG_TAB_BG_COLOR DefButton = FALSE ; }; }; -/* -ModalDialog RID_SCDLG_TAB_BG_COLOR -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 180 , 150 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - Control TAB_BG_COLOR_CT_BORDER - { - Border = TRUE ; - Pos = MAP_APPFONT ( 1 , 1 ) ; //12, 32 - Size = MAP_APPFONT ( 116+2 , 145+2 ) ; - DialogControl = TRUE; - }; - Control TAB_BG_COLOR_SET_BGDCOLOR - { - // * HelpId = HID_BACKGROUND_CTL_BGDCOLORSET ; - Hide = FALSE ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( 116 , 145 ) ; - TabStop = TRUE ; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 125 , 50 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 125 , 67 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = FALSE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 125 , 84 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = FALSE ; - }; -}; -*/ -/* -ModalDialog RID_SCDLG_MTRINPUT -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 190 , 63 ) ; - Moveable = TRUE ; - Closeable = FALSE ; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 136 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT ( 136 , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 136 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - FixedText FT_LABEL - { - Pos = MAP_APPFONT ( 6 , 8 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - }; - MetricField ED_VALUE - { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen - HelpId = HID_SC_MTRIN_VAL ; - Border = TRUE ; - Pos = MAP_APPFONT ( 70 , 6 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - }; - CheckBox BTN_DEFVAL - { - // HelpID, weil die generierten aus den Ableitungen nicht in die hid.lst kommen - TabStop = TRUE ; - Pos = MAP_APPFONT ( 70 , 24 ) ; - Size = MAP_APPFONT ( 58 , 10 ) ; - Text [ en-US ] = "~Default value" ; - }; -}; -*/ ModalDialog RID_SCDLG_COL_MAN { @@ -1458,6 +1363,3 @@ ModalDialog RID_SCDLG_CHARTCOLROW }; Text [ en-US ] = "Change Source Data Range" ; }; - - - diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src index a8c2daf4892a..86a5fc6498d4 100644 --- a/sc/source/ui/src/opredlin.src +++ b/sc/source/ui/src/opredlin.src @@ -97,40 +97,3 @@ TabPage RID_SCPAGE_OPREDLINE Text [ en-US ] = "By author" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src index 33aefbc2f5ba..9111205c0f13 100644 --- a/sc/source/ui/src/optdlg.src +++ b/sc/source/ui/src/optdlg.src @@ -114,11 +114,6 @@ TabPage RID_SCPAGE_CALC Size = MAP_APPFONT ( 121 , 8 ) ; Text [ en-US ] = "Date" ; }; - FixedLine FL_H_SEPARATOR - { - Pos = MAP_APPFONT ( 6 , 64 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - }; CheckBox BTN_CASE { Pos = MAP_APPFONT ( 12 , 77 ) ; diff --git a/sc/source/ui/src/pseudo.src b/sc/source/ui/src/pseudo.src index e3d27edf0ecb..73f78d1be0b8 100644 --- a/sc/source/ui/src/pseudo.src +++ b/sc/source/ui/src/pseudo.src @@ -25,38 +25,4 @@ * ************************************************************************/ - - - - - - - - - - - - - - - - #include <svx/svxids.hrc> - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src index 9cd22567d77c..aedfd5fd8ad0 100644 --- a/sc/source/ui/src/scwarngs.src +++ b/sc/source/ui/src/scwarngs.src @@ -43,41 +43,4 @@ Resource RID_WRNHDLSC /* ### ACHTUNG: Neuer Text in Resource? Die Maximalanzahl von Zeilen wurde überschritten. überzählige Zeilen wurden nicht mitimportiert! : Die Maximalanzahl von Zeilen wurde ³berschritten. ³berzõhlige Zeilen wurden nicht mitimportiert! */ Text [ en-US ] = "The number of rows exceeded the maximum. Additional rows were not imported!" ; }; - /* - String ERRCODE_SC_ & SH_MAX - { - Text = ""; - }; -*/ }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/simpref.src b/sc/source/ui/src/simpref.src index 03f41c1a56aa..1a0ade87d012 100644 --- a/sc/source/ui/src/simpref.src +++ b/sc/source/ui/src/simpref.src @@ -76,30 +76,3 @@ ModelessDialog RID_SCDLG_SIMPLEREF TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src index 1062eb58e1dc..17f2d9ca0b45 100644 --- a/sc/source/ui/src/sortdlg.src +++ b/sc/source/ui/src/sortdlg.src @@ -250,15 +250,8 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text [ en-US ] = "L~eft to right (sort columns)" ; TabStop = TRUE ; }; -/* - FixedText FT_AREA_LABEL - { - Pos = MAP_APPFONT ( 6 , 171 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Data area:" ; - }; -*/ }; + TabDialog RID_SCDLG_SORT { OutputSize = TRUE ; diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src index c0bcfba1b07b..ef614eff276c 100644 --- a/sc/source/ui/src/subtdlg.src +++ b/sc/source/ui/src/subtdlg.src @@ -237,55 +237,3 @@ TabDialog RID_SCDLG_SUBTOTALS TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src index 2b0e408262ba..eab99e713828 100644 --- a/sc/source/ui/src/textdlgs.src +++ b/sc/source/ui/src/textdlgs.src @@ -112,13 +112,6 @@ TabDialog RID_SCDLG_PARAGRAPH Text [ en-US ] = "Indents & Spacing" ; PageResID = RID_SVXPAGE_STD_PARAGRAPH ; }; - /* - PageItem { - Identifier = RID_SVXPAGE_EXT_PARAGRAPH; - Text [ en-US ] = "Paragraph (Extensions)"; - PageResID = RID_SVXPAGE_EXT_PARAGRAPH; - }; -*/ PageItem { Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ; @@ -165,33 +158,3 @@ TabDialog RID_SCDLG_PARAGRAPH TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src index 4c862e21ebd0..57a5f3b51700 100644 --- a/sc/source/ui/styleui/styledlg.src +++ b/sc/source/ui/styleui/styledlg.src @@ -134,39 +134,3 @@ TabDialog RID_SCDLG_STYLES_PAGE }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scaddins/source/analysis/analysis.src b/scaddins/source/analysis/analysis.src index f513ca660734..5f94659137c1 100644 --- a/scaddins/source/analysis/analysis.src +++ b/scaddins/source/analysis/analysis.src @@ -3566,39 +3566,3 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scaddins/source/analysis/analysis_deffuncnames.src b/scaddins/source/analysis/analysis_deffuncnames.src index 840800da8ae4..134a825e2063 100644 --- a/scaddins/source/analysis/analysis_deffuncnames.src +++ b/scaddins/source/analysis/analysis_deffuncnames.src @@ -870,5 +870,3 @@ Resource RID_ANALYSIS_DEFFUNCTION_NAMES }; }; - - diff --git a/scaddins/source/analysis/analysis_funcnames.src b/scaddins/source/analysis/analysis_funcnames.src index e5cd3e02f9d3..e9762cda2092 100644 --- a/scaddins/source/analysis/analysis_funcnames.src +++ b/scaddins/source/analysis/analysis_funcnames.src @@ -498,51 +498,3 @@ Resource RID_ANALYSIS_FUNCTION_NAMES }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scaddins/source/datefunc/datefunc.src b/scaddins/source/datefunc/datefunc.src index 80575e7fd933..a9edc3172ebd 100644 --- a/scaddins/source/datefunc/datefunc.src +++ b/scaddins/source/datefunc/datefunc.src @@ -314,35 +314,3 @@ Resource RID_DATE_DEFFUNCTION_NAMES }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |