diff options
44 files changed, 100 insertions, 859 deletions
diff --git a/svl/inc/svl/style.hrc b/svl/inc/svl/style.hrc index f49a95e48f67..b507e6ed960b 100644 --- a/svl/inc/svl/style.hrc +++ b/svl/inc/svl/style.hrc @@ -35,5 +35,3 @@ #define SFXSTYLEBIT_ALL 0xFFFF // alle Vorlagen #endif - - diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src index 009fcb19e3c6..206fe1a18893 100644 --- a/svl/source/items/cstitem.src +++ b/svl/source/items/cstitem.src @@ -30,40 +30,3 @@ String STR_COLUM_DT_AUTO { Text [ en-US ] = "automatic" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src index 6085155fb0f7..5d34a320c7d8 100644 --- a/svl/source/misc/mediatyp.src +++ b/svl/source/misc/mediatyp.src @@ -742,28 +742,3 @@ String STR_SVT_MIMETYPE_APP_SXIPACKED { Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src index f40530c10347..c8f5e6aa1911 100644 --- a/svtools/source/contnr/fileview.src +++ b/svtools/source/contnr/fileview.src @@ -83,7 +83,7 @@ String STR_SVT_GB Image IMG_SVT_FOLDER { - ImageBitmap = Bitmap { File = "folder.bmp" ; }; + ImageBitmap = Bitmap { File = "folder.png" ; }; MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; }; @@ -173,24 +173,3 @@ ModalDialog DLG_SVT_QUERYDELETE TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src index 82f0a75f0636..2a4b12a8250c 100644 --- a/svtools/source/contnr/svcontnr.src +++ b/svtools/source/contnr/svcontnr.src @@ -29,13 +29,13 @@ Image RID_IMG_TREENODE_COLLAPSED { - ImageBitmap = Bitmap { File = "plus.bmp"; } ; + ImageBitmap = Bitmap { File = "plus.png"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; Image RID_IMG_TREENODE_EXPANDED { - ImageBitmap = Bitmap { File = "minus.bmp"; } ; + ImageBitmap = Bitmap { File = "minus.png"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index 3aa594b7fb05..162202408437 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.src @@ -48,7 +48,7 @@ String STR_SVT_NEWDOC Image IMG_SVT_NEWDOC { - ImageBitmap = Bitmap { File = "new_doc.bmp" ; }; + ImageBitmap = Bitmap { File = "new_doc.png" ; }; MaskColor = MASK_COL_MAGENTA }; @@ -59,7 +59,7 @@ String STR_SVT_MYDOCS Image IMG_SVT_MYDOCS { - ImageBitmap = Bitmap { File = "my_docs.bmp" ; }; + ImageBitmap = Bitmap { File = "my_docs.png" ; }; MaskColor = MASK_COL_MAGENTA }; @@ -70,7 +70,7 @@ String STR_SVT_TEMPLATES Image IMG_SVT_TEMPLATES { - ImageBitmap = Bitmap { File = "template.bmp" ; }; + ImageBitmap = Bitmap { File = "template.png" ; }; MaskColor = MASK_COL_MAGENTA }; @@ -81,7 +81,7 @@ String STR_SVT_SAMPLES Image IMG_SVT_SAMPLES { - ImageBitmap = Bitmap { File = "samples.bmp" ; }; + ImageBitmap = Bitmap { File = "samples.png" ; }; MaskColor = MASK_COL_MAGENTA }; @@ -118,32 +118,32 @@ ToolBox TB_SVT_FILEVIEW Image IMG_SVT_DOCTEMPLATE_BACK_SMALL { - ImageBitmap = Bitmap { File = "back_small.bmp" ; }; + ImageBitmap = Bitmap { File = "back_small.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_BACK_LARGE { - ImageBitmap = Bitmap { File = "back_large.bmp" ; }; + ImageBitmap = Bitmap { File = "back_large.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_PREV_SMALL { - ImageBitmap = Bitmap { File = "up_small.bmp" ; }; + ImageBitmap = Bitmap { File = "up_small.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_PREV_LARGE { - ImageBitmap = Bitmap { File = "up_large.bmp" ; }; + ImageBitmap = Bitmap { File = "up_large.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_PRINT_SMALL { - ImageBitmap = Bitmap { File = "sc05509.bmp" ; }; + ImageBitmap = Bitmap { File = "sc05509.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_PRINT_LARGE { - ImageBitmap = Bitmap { File = "lc05509.bmp" ; }; + ImageBitmap = Bitmap { File = "lc05509.png" ; }; MaskColor = MASK_COL_MAGENTA }; @@ -174,22 +174,22 @@ ToolBox TB_SVT_FRAMEWIN Image IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL { - ImageBitmap = Bitmap { File = "info_small.bmp" ; }; + ImageBitmap = Bitmap { File = "info_small.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE { - ImageBitmap = Bitmap { File = "info_large.bmp" ; }; + ImageBitmap = Bitmap { File = "info_large.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL { - ImageBitmap = Bitmap { File = "preview_small.bmp" ; }; + ImageBitmap = Bitmap { File = "preview_small.png" ; }; MaskColor = MASK_COL_MAGENTA }; Image IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE { - ImageBitmap = Bitmap { File = "preview_large.bmp" ; }; + ImageBitmap = Bitmap { File = "preview_large.png" ; }; MaskColor = MASK_COL_MAGENTA }; @@ -279,24 +279,3 @@ String STR_SVT_SAMPLES_HELP { Text [ en-US ] = "Contains a selection of sample letters, reports and other documents"; }; - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src index 4dd31765a5c1..f9d0e676f0cb 100755 --- a/svtools/source/control/calendar.src +++ b/svtools/source/control/calendar.src @@ -42,33 +42,3 @@ String STR_SVT_CALENDAR_NONE { Text [ en-US ] = "None" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src index f192feca6ab0..2bb6c8cc4df8 100755 --- a/svtools/source/control/ctrlbox.src +++ b/svtools/source/control/ctrlbox.src @@ -33,19 +33,19 @@ IMAGE RID_IMG_SCALABLEFONT { - ImageBitmap = Bitmap { File = "scalfont.bmp" ; }; + ImageBitmap = Bitmap { File = "scalfont.png" ; }; MaskColor = IMAGE_STDBTN_COLOR ; }; IMAGE RID_IMG_PRINTERFONT { - ImageBitmap = Bitmap { File = "prnfont.bmp" ; }; + ImageBitmap = Bitmap { File = "prnfont.png" ; }; MaskColor = IMAGE_STDBTN_COLOR ; }; IMAGE RID_IMG_BITMAPFONT { - ImageBitmap = Bitmap { File = "bmpfont.bmp" ; }; + ImageBitmap = Bitmap { File = "bmpfont.png" ; }; MaskColor = IMAGE_STDBTN_COLOR ; }; @@ -183,32 +183,3 @@ String STR_SVT_INDEXENTRY_PHONETIC_LC { Text [ en-US ] = "Phonetic (alphanumeric last, grouped by consonants)"; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src index 72420af4908e..1cf580bd4309 100755 --- a/svtools/source/control/ctrltool.src +++ b/svtools/source/control/ctrltool.src @@ -66,18 +66,6 @@ String STR_SVT_STYLE_BLACK_ITALIC Text [ en-US ] = "Black Italic" ; }; -/* -Finnische Texte: - "Light", - "Light Kursivoitu", - "Normaali", - "Kursivoitu", - "Lihavoitu", - "Lihavoitu Kursivoitu", - "Black", - "Black Kursivoitu" -*/ - String STR_SVT_FONTMAP_BOTH { Text [ en-US ] = "The same font will be used on both your printer and your screen." ; @@ -107,38 +95,3 @@ String STR_SVT_FONTMAP_NOTAVAILABLE { Text [ en-US ] = "This font has not been installed. The closest available font will be used."; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src index dc8bbb5905d6..de6cb8409ff4 100644 --- a/svtools/source/control/filectrl.src +++ b/svtools/source/control/filectrl.src @@ -30,29 +30,3 @@ String STR_FILECTRL_BUTTONTEXT { Text [ en-US ] = "Browse..." ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 0652dfb9d0f5..52a663f5b3ae 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -25,15 +25,9 @@ * ************************************************************************/ -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif -#ifndef _SVT_ADDRESSTEMPLATE_HRC_ #include "addresstemplate.hrc" -#endif -#ifndef _SVT_CONTROLDIMS_HRC_ #include "controldims.hrc" -#endif #define FIELD_ROW_HEIGHT 17 diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src index 55517299c057..34df3c11eeaa 100644 --- a/svtools/source/dialogs/colrdlg.src +++ b/svtools/source/dialogs/colrdlg.src @@ -274,35 +274,3 @@ ModalDialog DLG_COLOR TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src index 977a0d6f430b..47277de88a52 100644 --- a/svtools/source/dialogs/filedlg2.src +++ b/svtools/source/dialogs/filedlg2.src @@ -86,41 +86,3 @@ String STR_FILEDLG_ASKNEWDIR { Text [ en-US ] = "Do you want the directory %s to be created ?" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src index f8ce80f62f2f..7587eedd6b86 100644 --- a/svtools/source/dialogs/formats.src +++ b/svtools/source/dialogs/formats.src @@ -291,4 +291,3 @@ String STR_FORMAT_ID_HTML_NO_COMMENT { Text [ en-US ] = "HTML format without comments"; }; - diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src index 8c6ceec2caed..6ce73d01aa7f 100644 --- a/svtools/source/dialogs/printdlg.src +++ b/svtools/source/dialogs/printdlg.src @@ -278,12 +278,12 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG Image RID_IMG_PRNDLG_COLLATE { - ImageBitmap = Bitmap { File = "collate.bmp" ; }; + ImageBitmap = Bitmap { File = "collate.png" ; }; MaskColor = IMAGE_MAGENTA_MASK ; }; Image RID_IMG_PRNDLG_NOCOLLATE { - ImageBitmap = Bitmap { File = "ncollate.bmp" ; }; + ImageBitmap = Bitmap { File = "ncollate.png" ; }; MaskColor = IMAGE_MAGENTA_MASK ; }; diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src index 1443a35e0f39..8bb866c4e40e 100644 --- a/svtools/source/dialogs/prnsetup.src +++ b/svtools/source/dialogs/prnsetup.src @@ -241,38 +241,3 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG Size = MAP_APPFONT ( 50 , 14 ) ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src index 9c82ea30071f..8f6956684350 100644 --- a/svtools/source/dialogs/wizardmachine.src +++ b/svtools/source/dialogs/wizardmachine.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif String STR_WIZDLG_FINISH { diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc index 90a3c1d162be..fae40f4c3f6f 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.hrc +++ b/svtools/source/filter.vcl/filter/dlgejpg.hrc @@ -35,5 +35,3 @@ #define GRP_COLORS 2 #define RB_GRAY 1 #define RB_RGB 2 - - diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src index fd224f22c409..0817f7cbf3c7 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.src +++ b/svtools/source/filter.vcl/filter/dlgejpg.src @@ -99,38 +99,3 @@ ModalDialog DLG_EXPORT_JPG Text [ en-US ] = "True Colors" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src index aa778842dc48..14c53ad8374b 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.src +++ b/svtools/source/filter.vcl/filter/dlgepng.src @@ -87,33 +87,3 @@ ModalDialog DLG_EXPORT_EPNG Text [ en-US ] = "~Interlaced" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src index 7573b394d72f..f1e63268fb22 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.src +++ b/svtools/source/filter.vcl/filter/dlgexpor.src @@ -274,42 +274,3 @@ ModalDialog DLG_EXPORT_VEC TabStop = TRUE ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src index 60e628ee0b5c..3087a70f1316 100644 --- a/svtools/source/filter.vcl/filter/strings.src +++ b/svtools/source/filter.vcl/filter/strings.src @@ -56,30 +56,3 @@ String KEY_RLE_CODING { Text = "RLE_Coding" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc index e78e3fb687fe..b94d0dfe8f8d 100644 --- a/svtools/source/inc/iodlg.hrc +++ b/svtools/source/inc/iodlg.hrc @@ -28,9 +28,7 @@ #ifndef _SVTOOLS_IODLGIMPL_HRC #define _SVTOOLS_IODLGIMPL_HRC -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif // ModalDialog DLG_SVT_EXPLORERFILE diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index d5990c05a663..fb750968b798 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.src @@ -89,5 +89,3 @@ String STR_ERROR_JVMCREATIONFAILED { Text[ en-US ] = "JRE is Defective" ; }; - - diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src index d5990c05a663..fb750968b798 100644 --- a/svtools/source/java/patchjavaerror.src +++ b/svtools/source/java/patchjavaerror.src @@ -89,5 +89,3 @@ String STR_ERROR_JVMCREATIONFAILED { Text[ en-US ] = "JRE is Defective" ; }; - - diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src index f33896e20003..08514ea23953 100644 --- a/svtools/source/misc/errtxt.src +++ b/svtools/source/misc/errtxt.src @@ -92,6 +92,7 @@ Resource RID_ERRCTX Text [ en-US ] = "$(ERR) searching for an address"; }; }; + Resource RID_ERRHDL { String ERRCODE_CLASS_ABORT diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src index 1f2eaaa291a3..d3566a404a01 100644 --- a/svtools/source/misc/helpagent.src +++ b/svtools/source/misc/helpagent.src @@ -31,11 +31,10 @@ Bitmap BMP_HELP_AGENT_IMAGE { - File = "helpagent.bmp"; + File = "helpagent.png"; }; Bitmap BMP_HELP_AGENT_CLOSER { - File = "closer.bmp"; + File = "closer.png"; }; - diff --git a/svtools/source/plugapp/commtest.src b/svtools/source/plugapp/commtest.src index 7073699f4956..d1efb29a1730 100644 --- a/svtools/source/plugapp/commtest.src +++ b/svtools/source/plugapp/commtest.src @@ -33,7 +33,6 @@ ToolBox TBMenu { Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 100, 20 ); LineCount = 2; -// FloatingLines = 2; ItemList = { ToolBoxItem { Identifier = SERVER_TCP; diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src index 9cc52c58f013..55112329dcf5 100644 --- a/svtools/source/plugapp/testtool.src +++ b/svtools/source/plugapp/testtool.src @@ -40,16 +40,9 @@ ToolBox DisplayHidToolBox { ToolBoxItem { Type = TOOLBOXITEM_BUTTON; _ToolBoxItemFlags = TIB_AUTOCHECK ; - -/* -class FlagToolBoxState -{ - TIB_CHECKABLE, TIB_AUTOCHECK, TIB_RADIOCHECK, TIB_LEFT, - TIB_AUTOSIZE, TIB_DROPDOWN, -};*/ Identifier = TT_SHOW; ItemBitmap = Bitmap { - File = "ttshow.bmp"; + File = "ttshow.png"; }; Text[ en-US ] = "Display IDs"; }; @@ -67,7 +60,7 @@ class FlagToolBoxState ToolBoxItem { Identifier = TT_SEND_DATA; ItemBitmap = Bitmap { - File = "ttremote.bmp"; + File = "ttremote.png"; }; Text[ en-US ] = "Transfer to TestTool"; }; @@ -77,21 +70,21 @@ class FlagToolBoxState ToolBoxItem { Identifier = TT_ALLWIN; ItemBitmap = Bitmap { - File = "ttall.bmp"; + File = "ttall.png"; }; Text[ en-US ] = "Show all windows"; }; ToolBoxItem { Identifier = TT_KURZNAME; ItemBitmap = Bitmap { - File = "ttdef.bmp"; + File = "ttdef.png"; }; Text[ en-US ] = "Show short names (if available)"; }; ToolBoxItem { Identifier = TT_LANGNAME; ItemBitmap = Bitmap { - File = "tthid.bmp"; + File = "tthid.png"; }; Text[ en-US ] = "Always show long-name"; }; @@ -100,7 +93,7 @@ class FlagToolBoxState }; Bitmap TT_SHOW2 { - File = "ttshow2.bmp"; + File = "ttshow2.png"; }; WorkWindow TT_INLINE_TRANSLATION { @@ -111,60 +104,60 @@ WorkWindow TT_INLINE_TRANSLATION { Closeable = TRUE; Border = TRUE; GroupBox TT_GB_TRANSLATION { - Pos = MAP_APPFONT( 2, 3 ); - Size = MAP_APPFONT( 173, 44 ); + Pos = MAP_APPFONT( 2, 3 ); + Size = MAP_APPFONT( 173, 44 ); Text[ en-US ] = "Translation"; }; Edit TT_E_NEW { - Disable = TRUE; - Border = TRUE; - Pos = MAP_APPFONT( 7, 16 ); - Size = MAP_APPFONT( 162, 12 ); - TabStop = TRUE; + Disable = TRUE; + Border = TRUE; + Pos = MAP_APPFONT( 7, 16 ); + Size = MAP_APPFONT( 162, 12 ); + TabStop = TRUE; Text[ en-US ] = "~Edit"; }; FixedText TT_FT_OLD { - Pos = MAP_APPFONT( 7, 33 ); - Size = MAP_APPFONT( 162, 10 ); + Pos = MAP_APPFONT( 7, 33 ); + Size = MAP_APPFONT( 162, 10 ); Text[ en-US ] = "Original Text"; }; GroupBox TT_GB_COMMENT { - Pos = MAP_APPFONT( 2, 52 ); - Size = MAP_APPFONT( 173, 32 ); + Pos = MAP_APPFONT( 2, 52 ); + Size = MAP_APPFONT( 173, 32 ); Text[ en-US ] = "Comment"; }; Edit TT_E_COMMENT { - Disable = TRUE; - Border = TRUE; - Pos = MAP_APPFONT( 7, 64 ); - Size = MAP_APPFONT( 162, 12 ); - TabStop = TRUE; + Disable = TRUE; + Border = TRUE; + Pos = MAP_APPFONT( 7, 64 ); + Size = MAP_APPFONT( 162, 12 ); + TabStop = TRUE; Text[ en-US ] = "~Comment"; }; PushButton TT_PB_SELECT { - Pos = MAP_APPFONT( Control_Border, 89 ); - Size = MAP_APPFONT( ButtonWidth, 12 ); - TabStop = TRUE; + Pos = MAP_APPFONT( Control_Border, 89 ); + Size = MAP_APPFONT( ButtonWidth, 12 ); + TabStop = TRUE; Text[ en-US ] = "~Select"; }; PushButton TT_PB_RESTORE { - Disable = TRUE; - Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 ); - Size = MAP_APPFONT( ButtonWidth, 12 ); - TabStop = TRUE; + Disable = TRUE; + Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 ); + Size = MAP_APPFONT( ButtonWidth, 12 ); + TabStop = TRUE; Text[ en-US ] = "~Restore"; }; PushButton TT_PB_ACCEPT { - Disable = TRUE; - Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 ); - Size = MAP_APPFONT( ButtonWidth, 12 ); - TabStop = TRUE; + Disable = TRUE; + Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 ); + Size = MAP_APPFONT( ButtonWidth, 12 ); + TabStop = TRUE; Text[ en-US ] = "~Accept"; }; PushButton TT_PB_NEXT { - Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 ); - Size = MAP_APPFONT( ButtonWidth, 12 ); - TabStop = TRUE; + Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 ); + Size = MAP_APPFONT( ButtonWidth, 12 ); + TabStop = TRUE; Text[ en-US ] = "~Next"; }; Text[ en-US ] = "Inplace Translation"; diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src index c4cdcbcbe3ec..4021e395b069 100644 --- a/svtools/source/productregistration/registrationdlg.src +++ b/svtools/source/productregistration/registrationdlg.src @@ -25,15 +25,9 @@ * ************************************************************************/ -#ifndef SVTOOLS_REGISTRATIONDLG_HRC #include "registrationdlg.hrc" -#endif -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif -#ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> -#endif ModalDialog DLG_REGISTRATION_REQUEST { @@ -52,7 +46,7 @@ ModalDialog DLG_REGISTRATION_REQUEST { ImageBitmap = Bitmap { - File = "regkey.bmp" ; + File = "regkey.png" ; }; MaskColor = Color { Red = 0x0000 ; Green = 0x0000 ; Blue = 0xFFFF ; }; }; diff --git a/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx index 0388b0735113..b2c7a5771f78 100644 --- a/toolkit/inc/toolkit/helper/throbberimpl.hxx +++ b/toolkit/inc/toolkit/helper/throbberimpl.hxx @@ -40,12 +40,14 @@ namespace toolkit //........................................................................ { +#define CSS_UNO ::com::sun::star::uno +#define CSS_GRAPHIC ::com::sun::star::graphic class Throbber_Impl { private: - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > maImageList; - ::com::sun::star::uno::Reference< VCLXWindow > mxParent; + CSS_UNO::Sequence< CSS_UNO::Reference< CSS_GRAPHIC::XGraphic > > maImageList; + CSS_UNO::Reference< VCLXWindow > mxParent; sal_Bool mbRepeat; sal_Int32 mnStepTime; @@ -56,7 +58,7 @@ namespace toolkit DECL_LINK( TimeOutHdl, Throbber_Impl* ); public: - Throbber_Impl( ::com::sun::star::uno::Reference< VCLXWindow > xParent, + Throbber_Impl( CSS_UNO::Reference< VCLXWindow > xParent, sal_Int32 nStepTime, sal_Bool bRepeat ); ~Throbber_Impl(); @@ -66,15 +68,17 @@ namespace toolkit void setRepeat( sal_Bool bRepeat ) { mbRepeat = bRepeat; } // XSimpleAnimation - void start() throw ( ::com::sun::star::uno::RuntimeException ); - void stop() throw ( ::com::sun::star::uno::RuntimeException ); - void setImageList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& ImageList ) - throw ( ::com::sun::star::uno::RuntimeException ); + void start() throw ( CSS_UNO::RuntimeException ); + void stop() throw ( CSS_UNO::RuntimeException ); + void setImageList( const CSS_UNO::Sequence< CSS_UNO::Reference< CSS_GRAPHIC::XGraphic > >& ImageList ) + throw ( CSS_UNO::RuntimeException ); // Helpers - void initImage() throw ( ::com::sun::star::uno::RuntimeException ); - sal_Bool isHCMode() throw ( ::com::sun::star::uno::RuntimeException ); + void initImage() throw ( CSS_UNO::RuntimeException ); }; //........................................................................ +#undef CSS_UNO +#undef CSS_GRAPHIC + } // namespacetoolkit //........................................................................ diff --git a/toolkit/source/helper/throbberimpl.cxx b/toolkit/source/helper/throbberimpl.cxx index 1fff8ff121cf..d11a13661148 100644 --- a/toolkit/source/helper/throbberimpl.cxx +++ b/toolkit/source/helper/throbberimpl.cxx @@ -101,17 +101,6 @@ namespace toolkit pImage->SetImage( maImageList[ 0 ] ); } - //-------------------------------------------------------------------- - sal_Bool Throbber_Impl::isHCMode() - throw ( uno::RuntimeException ) - { - FixedImage* pImage = static_cast< FixedImage* >( mxParent->GetWindow() ); - if ( pImage ) - return pImage->GetSettings().GetStyleSettings().GetHighContrastMode(); - else - return Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - } - // ----------------------------------------------------------------------- IMPL_LINK( Throbber_Impl, TimeOutHdl, Throbber_Impl*, EMPTYARG ) { diff --git a/toolkit/workben/layout/sortdlg.hrc b/toolkit/workben/layout/sortdlg.hrc index 0cecd39e8541..1b62f3f8cbac 100644 --- a/toolkit/workben/layout/sortdlg.hrc +++ b/toolkit/workben/layout/sortdlg.hrc @@ -33,12 +33,6 @@ // -> SCSTR_UNDEFINED // -> SCSTR_FIELD -/* -#define RID_SCDLG_SORT 256 -#define RID_SCPAGE_SORT_FIELDS 257 -#define RID_SCPAGE_SORT_OPTIONS 258 -*/ - #define TP_FIELDS 1 #define TP_OPTIONS 2 @@ -61,8 +55,6 @@ #define LB_SORT_USER 2 #define LB_OUTAREA 3 #define ED_OUTAREA 4 -//#define FT_AREA_LABEL 5 -//#define FT_AREA 6 #define BTN_SORT_USER 7 #define BTN_CASESENSITIVE 8 #define BTN_LABEL 9 @@ -77,7 +69,3 @@ #define FT_ALGORITHM 18 #define LB_ALGORITHM 19 #define BTN_NATURALSORT 20 - - - - diff --git a/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src index 5e855962af96..f9980f36002c 100644 --- a/toolkit/workben/layout/sortdlg.src +++ b/toolkit/workben/layout/sortdlg.src @@ -116,6 +116,7 @@ TabPage RID_SCPAGE_SORT_FIELDS Text [ en-US ] = "T~hen by" ; }; }; + TabPage RID_SCPAGE_SORT_OPTIONS { Hide = TRUE ; @@ -158,7 +159,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text [ de ] = "Enable ~natural sort" ; Text [ en-US ] = "Enable ~natural sort" ; Text [ cs ] = "Aktivovat pÅ™irozené tÅ™ÃdÄ›nÃ" ; - Text [ sk ] = "AktivovaÅ¥ prirodzené triedenie" ; + Text [ sk ] = "AktivovaÅ¥ prirodzené triedenie" ; TabStop = TRUE ; Text [ x-comment ] = " " ; }; @@ -250,15 +251,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 ; @@ -313,5 +307,3 @@ TabDialog RID_SCDLG_SORT TabStop = TRUE ; }; }; - - diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src index 4bee5900eaaf..ea9aa993cba2 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src @@ -79,25 +79,6 @@ Menu MENU_POPUP }; }; -/* -Bitmap BMP_FOLDER_CLOSED -{ - File = "bmp/fldclose.bmp" ; -}; -Bitmap BMP_FOLDER_OPENED -{ - File = "bmp/fldopen.bmp" ; -}; -Bitmap BMP_DOCUMENT -{ - File = "bmp/document.bmp" ; -}; -Bitmap BMP_LINK -{ - File = "bmp/link.bmp" ; -}; -*/ - ModalDialog DLG_STRINGINPUT { Border = TRUE ; @@ -146,4 +127,3 @@ String TEXT_TITLEBAR { Text [ en-US ] = "UCB Explorer" ; }; - diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx index f741cb6cd0d3..7549d1e5ea5e 100644 --- a/vcl/inc/vcl/prndlg.hxx +++ b/vcl/inc/vcl/prndlg.hxx @@ -61,7 +61,6 @@ namespace vcl rtl::OUString maReplacementString; rtl::OUString maToolTipString; - bool useHCColorReplacement() const; public: PrintPreviewWindow( Window* pParent, const ResId& ); virtual ~PrintPreviewWindow(); @@ -169,9 +168,7 @@ namespace vcl FixedImage maCollateImage; Image maCollateImg; - Image maCollateHCImg; Image maNoCollateImg; - Image maNoCollateHCImg; long mnCollateUIMode; diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 3229b6f1654d..69ac3f540b65 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -231,7 +231,6 @@ struct ImplSVWinData Window* mpTrackWin; // window, that is in tracking mode AutoTimer* mpTrackTimer; // tracking timer ImageList* mpMsgBoxImgList; // ImageList for MessageBox - ImageList* mpMsgBoxHCImgList; // ImageList for MessageBox (high contrast mode) Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode USHORT mnTrackFlags; // tracking flags USHORT mnAutoScrollFlags; // auto scroll flags @@ -255,9 +254,7 @@ struct ImplSVCtrlData ImageList* mpSplitHArwImgList; // ImageList for Horizontale SplitWindows (Arrows) ImageList* mpSplitVArwImgList; // ImageList for Vertikale SplitWindows (Arrows) Image* mpDisclosurePlus; - Image* mpDisclosurePlusHC; Image* mpDisclosureMinus; - Image* mpDisclosureMinusHC; ImplTBDragMgr* mpTBDragMgr; // DragMgr for ToolBox USHORT mnCheckStyle; // CheckBox-Style for ImageList-Update USHORT mnRadioStyle; // Radio-Style for ImageList-Update diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc index a97d7df347ee..50e334deaa3b 100644 --- a/vcl/inc/vcl/svids.hrc +++ b/vcl/inc/vcl/svids.hrc @@ -57,8 +57,6 @@ #define SV_DISCLOSURE_PLUS 1060 #define SV_DISCLOSURE_MINUS 1061 -#define SV_DISCLOSURE_PLUS_HC 1062 -#define SV_DISCLOSURE_MINUS_HC 1063 #define SV_RESID_MENU_EDIT 2000 #define SV_MENU_EDIT_UNDO 1 @@ -140,8 +138,6 @@ #define SV_PRINT_BUTTONLINE 14 #define SV_PRINT_COLLATE_IMG 15 #define SV_PRINT_NOCOLLATE_IMG 16 -#define SV_PRINT_COLLATE_HC_IMG 17 -#define SV_PRINT_NOCOLLATE_HC_IMG 18 #define SV_PRINT_NOPAGES 19 #define SV_PRINT_STATUS_TXT 20 #define SV_PRINT_LOCATION_TXT 21 @@ -232,8 +228,6 @@ #define SV_ICON_LARGE_START 24000 #define SV_ICON_SMALL_START 25000 -#define SV_ICON_LARGE_HC_START 26000 -#define SV_ICON_SMALL_HC_START 27000 #define SV_ICON_ID_OFFICE 1 #define SV_ICON_ID_TEXT 2 diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4f76193d4b90..d08994c9d6de 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -392,11 +392,6 @@ void DeInitVCL() delete pSVData->maWinData.mpMsgBoxImgList; pSVData->maWinData.mpMsgBoxImgList = NULL; } - if ( pSVData->maWinData.mpMsgBoxHCImgList ) - { - delete pSVData->maWinData.mpMsgBoxHCImgList; - pSVData->maWinData.mpMsgBoxHCImgList = NULL; - } if ( pSVData->maCtrlData.mpCheckImgList ) { delete pSVData->maCtrlData.mpCheckImgList; @@ -437,21 +432,11 @@ void DeInitVCL() delete pSVData->maCtrlData.mpDisclosurePlus; pSVData->maCtrlData.mpDisclosurePlus = NULL; } - if ( pSVData->maCtrlData.mpDisclosurePlusHC ) - { - delete pSVData->maCtrlData.mpDisclosurePlusHC; - pSVData->maCtrlData.mpDisclosurePlusHC = NULL; - } if ( pSVData->maCtrlData.mpDisclosureMinus ) { delete pSVData->maCtrlData.mpDisclosureMinus; pSVData->maCtrlData.mpDisclosureMinus = NULL; } - if ( pSVData->maCtrlData.mpDisclosureMinusHC ) - { - delete pSVData->maCtrlData.mpDisclosureMinusHC; - pSVData->maCtrlData.mpDisclosureMinusHC = NULL; - } if ( pSVData->mpDefaultWin ) { delete pSVData->mpDefaultWin; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 2373395ae248..51f602542ae1 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -4382,18 +4382,11 @@ void DisclosureButton::ImplDrawCheckBoxState() ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData ); if( ! rCtrlData.mpDisclosurePlus ) rCtrlData.mpDisclosurePlus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS ) ) ); - if( ! rCtrlData.mpDisclosurePlusHC ) - rCtrlData.mpDisclosurePlusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS_HC ) ) ); if( ! rCtrlData.mpDisclosureMinus ) rCtrlData.mpDisclosureMinus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS ) ) ); - if( ! rCtrlData.mpDisclosureMinusHC ) - rCtrlData.mpDisclosureMinusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS_HC ) ) ); Image* pImg = NULL; - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - pImg = IsChecked() ? rCtrlData.mpDisclosureMinusHC : rCtrlData.mpDisclosurePlusHC; - else - pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus; + pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus; DBG_ASSERT( pImg, "no disclosure image" ); if( ! pImg ) @@ -4429,5 +4422,4 @@ void DisclosureButton::KeyInput( const KeyEvent& rKEvt ) Button::KeyInput( rKEvt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index 6d2360dae6cb..a6792b202b3d 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -80,68 +80,3 @@ String SV_BUTTONTEXT_ABORT { Text [ en-US ] = "~Abort"; }; - -/* HelpTexte, die wir derzeit nicht mehr verwenden: -SV_BUTTONHELPTEXT_OK -{ - Text = "Schließt dieses Dialogfeld und speichert alle vorgenommenen Änderungen." ; -}; - -SV_BUTTONHELPTEXT_CANCEL -{ - Text = "Schließt dieses Dialogfeld, ohne Ihre Änderungen zu speichern." ; -}; - -SV_BUTTONHELPTEXT_HELP -{ - Text = "Zeigt Hilfe zu diesem Fenster an." ; -}; - -SV_BUTTONHELPTEXT_MORE -{ - Text = "Zeigt weitere EinstellmÖglichkeiten an oder versteckt diese wieder." ; -}; - -Finnische-Texte: -OK OK -CANCEL Peruuta -HELP ~Ohje -MORE ~Enemmän -YES ~Kyllä -NO ~Ei -RETRY ~Yritäuudelleen -*/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src index a42a9531d9ee..59d7ea3d443e 100644 --- a/vcl/source/src/helptext.src +++ b/vcl/source/src/helptext.src @@ -138,26 +138,3 @@ String SV_SHORTCUT_SPLITTER { Text [ en-US ] = "Split window separator" ; }; - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index 35b52f422ac8..871cd6af2b29 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -35,27 +35,27 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET) { - File = "check.bmp"; + File = "check.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_WINOFFSET) { - File = "checkwin.bmp"; + File = "checkwin.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_OS2OFFSET) { - File = "checkos2.bmp"; + File = "checkos2.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MACOFFSET) { - File = "checkmac.bmp"; + File = "checkmac.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_UNIXOFFSET) { - File = "checkunx.bmp"; + File = "checkunx.png"; }; Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET) @@ -65,39 +65,39 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET) Bitmap (SV_RESID_BITMAP_SCROLLBMP) { - File = "scrbmp.bmp"; + File = "scrbmp.png"; }; Bitmap (SV_RESID_BITMAP_SCROLLMSK) { - File = "scrmsk.bmp"; + File = "scrmsk.png"; }; // ----------------------------------------------------------------------- Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET) { - File = "radio.bmp"; + File = "radio.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_WINOFFSET) { - File = "radiowin.bmp"; + File = "radiowin.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_OS2OFFSET) { - File = "radioos2.bmp"; + File = "radioos2.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MACOFFSET) { - File = "radiomac.bmp"; + File = "radiomac.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_UNIXOFFSET) { - File = "radiounx.bmp"; + File = "radiounx.png"; }; Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET) @@ -112,32 +112,32 @@ Bitmap SV_RESID_BITMAP_MSGBOX Bitmap SV_RESID_BITMAP_PIN { - File = "pin.bmp"; + File = "pin.png"; }; Bitmap SV_RESID_BITMAP_CLOSEDOC { - File = "closedoc.bmp"; + File = "closedoc.png"; }; Bitmap SV_RESID_BITMAP_SPLITHPIN { - File = "splhpin.bmp"; + File = "splhpin.png"; }; Bitmap SV_RESID_BITMAP_SPLITVPIN { - File = "splvpin.bmp"; + File = "splvpin.png"; }; Bitmap SV_RESID_BITMAP_SPLITHARW { - File = "splharw.bmp"; + File = "splharw.png"; }; Bitmap SV_RESID_BITMAP_SPLITVARW { - File = "splvarw.bmp"; + File = "splvarw.png"; }; Bitmap (SV_ICON_SIZE48_START) diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 709ee79d1424..c380791de83b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -73,89 +73,19 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const Re { SetPaintTransparent( TRUE ); SetBackground(); - if( useHCColorReplacement() ) - maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() ); - else - maPageVDev.SetBackground( Color( COL_WHITE ) ); + maPageVDev.SetBackground( Color( COL_WHITE ) ); } PrintDialog::PrintPreviewWindow::~PrintPreviewWindow() { } -bool PrintDialog::PrintPreviewWindow::useHCColorReplacement() const -{ - bool bRet = false; - if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - try - { - // get service provider - Reference< XMultiServiceFactory > xSMgr( unohelper::GetMultiServiceFactory() ); - // create configuration hierachical access name - if( xSMgr.is() ) - { - try - { - Reference< XMultiServiceFactory > xConfigProvider( - Reference< XMultiServiceFactory >( - xSMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationProvider" ))), - UNO_QUERY ) - ); - if( xConfigProvider.is() ) - { - Sequence< Any > aArgs(1); - PropertyValue aVal; - aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); - aVal.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Accessibility" ) ); - aArgs.getArray()[0] <<= aVal; - Reference< XNameAccess > xConfigAccess( - Reference< XNameAccess >( - xConfigProvider->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess" )), - aArgs ), - UNO_QUERY ) - ); - if( xConfigAccess.is() ) - { - try - { - sal_Bool bValue = sal_False; - Any aAny = xConfigAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsForPagePreviews" ) ) ); - if( aAny >>= bValue ) - bRet = bool(bValue); - } - catch( NoSuchElementException& ) - { - } - catch( WrappedTargetException& ) - { - } - } - } - } - catch( Exception& ) - { - } - } - } - catch( WrappedTargetException& ) - { - } - } - return bRet; -} - void PrintDialog::PrintPreviewWindow::DataChanged( const DataChangedEvent& i_rDCEvt ) { // react on settings changed if( i_rDCEvt.GetType() == DATACHANGED_SETTINGS ) { - if( useHCColorReplacement() ) - maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() ); - else - maPageVDev.SetBackground( Color( COL_WHITE ) ); + maPageVDev.SetBackground( Color( COL_WHITE ) ); } Window::DataChanged( i_rDCEvt ); } @@ -304,10 +234,6 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi #endif SetQuickHelpText( aBuf.makeStringAndClear() ); maMtf = i_rNewPreview; - if( useHCColorReplacement() ) - { - maMtf.ReplaceColors( Color( COL_BLACK ), Color( COL_WHITE ), 30 ); - } maOrigSize = i_rOrigSize; maReplacementString = i_rReplacement; @@ -598,9 +524,7 @@ PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId ) , maCollateBox( this, VclResId( SV_PRINT_COLLATE ) ) , maCollateImage( this, VclResId( SV_PRINT_COLLATE_IMAGE ) ) , maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) ) - , maCollateHCImg( VclResId( SV_PRINT_COLLATE_HC_IMG ) ) , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) ) - , maNoCollateHCImg( VclResId( SV_PRINT_NOCOLLATE_HC_IMG ) ) , mnCollateUIMode( 0 ) , maLayout( NULL, true ) { @@ -1730,20 +1654,12 @@ void PrintDialog::checkControlDependencies() maJobPage.maCollateBox.Enable( FALSE ); Image aImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg ); - Image aHCImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateHCImg : maJobPage.maNoCollateHCImg ); - bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode(); Size aImgSize( aImg.GetSizePixel() ); - Size aHCImgSize( aHCImg.GetSizePixel() ); - - if( aHCImgSize.Width() > aImgSize.Width() ) - aImgSize.Width() = aHCImgSize.Width(); - if( aHCImgSize.Height() > aImgSize.Height() ) - aImgSize.Height() = aHCImgSize.Height(); // adjust size of image maJobPage.maCollateImage.SetSizePixel( aImgSize ); - maJobPage.maCollateImage.SetImage( bHC ? aHCImg : aImg ); + maJobPage.maCollateImage.SetImage( aImg ); maJobPage.maLayout.resize(); // enable setup button only for printers that can be setup |