[Libreoffice-commits] .: svtools/inc svtools/source vcl/source

Sebastian Spaeth spaetz at kemper.freedesktop.org
Thu Nov 11 06:36:40 PST 2010


 svtools/inc/svtools/svtools.hrc              |   27 ---
 svtools/source/contnr/templwin.cxx           |   41 ++---
 svtools/source/contnr/templwin.src           |   74 ---------
 svtools/source/control/ctrlbox.cxx           |    8 
 svtools/source/control/ctrlbox.src           |   20 --
 svtools/source/dialogs/printdlg.cxx          |   14 -
 svtools/source/dialogs/printdlg.src          |   44 -----
 svtools/source/toolpanel/toolpanel.src       |   10 -
 svtools/source/toolpanel/toolpaneldrawer.cxx |   15 -
 vcl/source/src/images.src                    |  217 ---------------------------
 vcl/source/src/print.src                     |   10 -
 11 files changed, 34 insertions(+), 446 deletions(-)

New commits:
commit f9adf248deb96de179103b611c30ae23933bc577
Author: Sebastian Spaeth <Sebastian at SSpaeth.de>
Date:   Thu Nov 11 14:55:06 2010 +0100

    Remove more traces of _HC (high contrast)
    
    This patch needs to go hand in hand with the similar one in libs-core,
    I believe.

diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc
index 140cf38..f39e65b 100644
--- a/svtools/inc/svtools/svtools.hrc
+++ b/svtools/inc/svtools/svtools.hrc
@@ -152,7 +152,7 @@
 #define STR_SVT_PRNDLG_POWER_SAVE			(STR_SVT_PRNDLG_START+26)
 #define STR_SVT_PRNDLG_DEFPRINTER			(STR_SVT_PRNDLG_START+27)
 #define STR_SVT_PRNDLG_JOBCOUNT 			(STR_SVT_PRNDLG_START+28)
-#define STR_SVT_PRNDLG_END					(RID_IMG_PRNDLG_NOCOLLATE_HC)
+#define STR_SVT_PRNDLG_END				(RID_IMG_PRNDLG_NOCOLLATE)
 
 #define STR_SVT_CALENDAR_START				(STR_SVT_PRNDLG_END+1)
 #define STR_SVT_CALENDAR_DAY				(STR_SVT_CALENDAR_START+0)
@@ -345,14 +345,9 @@
 #define RID_IMG_PRINTERFONT 			(RID_SVTOOLS_START + 12)
 #define RID_IMG_BITMAPFONT				(RID_SVTOOLS_START + 13)
 #define RID_IMG_SCALABLEFONT			(RID_SVTOOLS_START + 14)
-#define RID_IMG_PRINTERFONT_HC 			(RID_SVTOOLS_START + 15)
-#define RID_IMG_BITMAPFONT_HC			(RID_SVTOOLS_START + 16)
-#define RID_IMG_SCALABLEFONT_HC			(RID_SVTOOLS_START + 17)
 
 #define IMG_TRIANGLE_RIGHT              (RID_SVTOOLS_START + 18)
-#define IMG_TRIANGLE_RIGHT_HC           (RID_SVTOOLS_START + 19)
 #define IMG_TRIANGLE_DOWN               (RID_SVTOOLS_START + 20)
-#define IMG_TRIANGLE_DOWN_HC            (RID_SVTOOLS_START + 21)
 
 #define IMG_SVT_FOLDER					(RID_SVTOOLS_START + 40)
 
@@ -361,11 +356,6 @@
 #define IMG_SVT_TEMPLATES				(RID_SVTOOLS_START + 54)
 #define IMG_SVT_SAMPLES					(RID_SVTOOLS_START + 55)
 
-#define IMG_SVT_NEWDOC_HC				(RID_SVTOOLS_START + 59)
-#define IMG_SVT_MYDOCS_HC				(RID_SVTOOLS_START + 60)
-#define IMG_SVT_TEMPLATES_HC			(RID_SVTOOLS_START + 61)
-#define IMG_SVT_SAMPLES_HC				(RID_SVTOOLS_START + 62)
-
 #define	IMG_SVT_DOCTEMPLATE_BACK_SMALL		(RID_SVTOOLS_START + 70)
 #define	IMG_SVT_DOCTEMPLATE_BACK_LARGE		(RID_SVTOOLS_START + 71)
 #define	IMG_SVT_DOCTEMPLATE_PREV_SMALL		(RID_SVTOOLS_START + 72)
@@ -377,23 +367,8 @@
 #define	IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL	(RID_SVTOOLS_START + 78)
 #define	IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE	(RID_SVTOOLS_START + 79)
 
-#define	IMG_SVT_DOCTEMPL_HC_BACK_SMALL		(RID_SVTOOLS_START + 80)
-#define	IMG_SVT_DOCTEMPL_HC_BACK_LARGE		(RID_SVTOOLS_START + 81)
-#define	IMG_SVT_DOCTEMPL_HC_PREV_SMALL		(RID_SVTOOLS_START + 82)
-#define	IMG_SVT_DOCTEMPL_HC_PREV_LARGE		(RID_SVTOOLS_START + 83)
-#define	IMG_SVT_DOCTEMPL_HC_PRINT_SMALL		(RID_SVTOOLS_START + 84)
-#define	IMG_SVT_DOCTEMPL_HC_PRINT_LARGE		(RID_SVTOOLS_START + 85)
-#define	IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL	(RID_SVTOOLS_START + 86)
-#define	IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE	(RID_SVTOOLS_START + 87)
-#define	IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL	(RID_SVTOOLS_START + 88)
-#define	IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE	(RID_SVTOOLS_START + 89)
-
 #define RID_IMG_PRNDLG_COLLATE              (STR_SVT_PRNDLG_START + 29)
 #define RID_IMG_PRNDLG_NOCOLLATE            (STR_SVT_PRNDLG_START + 30)
-#define RID_IMG_PRNDLG_COLLATE_HC           (STR_SVT_PRNDLG_START + 31)
-#define RID_IMG_PRNDLG_NOCOLLATE_HC         (STR_SVT_PRNDLG_START + 32)
 
 #endif	// #ifndef _SVTOOLS_HRC
 
-// ******************************************************************* EOF
-
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 51c81cb..764b565 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -362,8 +362,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
 
     // insert the categories
     // "New Document"
-    sal_Bool bHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-    Image aImage( SvtResId( bHiContrast ? IMG_SVT_NEWDOC_HC : IMG_SVT_NEWDOC ) );
+    Image aImage( SvtResId( IMG_SVT_NEWDOC ) );
     nMaxTextLength = aImage.GetSizePixel().Width();
     String aEntryStr = String( SvtResId( STR_SVT_NEWDOC ) );
     SvxIconChoiceCtrlEntry*	pEntry =
@@ -380,7 +379,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
     {
         aEntryStr = String( SvtResId( STR_SVT_TEMPLATES ) );
         pEntry = aIconCtrl.InsertEntry(
-            aEntryStr, Image( SvtResId( bHiContrast ? IMG_SVT_TEMPLATES_HC : IMG_SVT_TEMPLATES ) ), ICON_POS_TEMPLATES );
+            aEntryStr, Image( SvtResId( IMG_SVT_TEMPLATES ) ), ICON_POS_TEMPLATES );
         pEntry->SetUserData( new String( aTemplateRootURL ) );
         pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_TEMPLATES_HELP ) ) );
         DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" );
@@ -392,7 +391,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
     // "My Documents"
     aEntryStr = String( SvtResId( STR_SVT_MYDOCS ) );
     pEntry = aIconCtrl.InsertEntry(
-        aEntryStr, Image( SvtResId( bHiContrast ? IMG_SVT_MYDOCS_HC : IMG_SVT_MYDOCS ) ), ICON_POS_MYDOCS );
+        aEntryStr, Image( SvtResId( IMG_SVT_MYDOCS ) ), ICON_POS_MYDOCS );
     pEntry->SetUserData( new String( aMyDocumentsRootURL ) );
     pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_MYDOCS_HELP ) ) );
     DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" );
@@ -403,7 +402,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
     // "Samples"
     aEntryStr = String( SvtResId( STR_SVT_SAMPLES ) );
     pEntry = aIconCtrl.InsertEntry(
-        aEntryStr, Image( SvtResId( bHiContrast ? IMG_SVT_SAMPLES_HC : IMG_SVT_SAMPLES ) ), ICON_POS_SAMPLES );
+        aEntryStr, Image( SvtResId( IMG_SVT_SAMPLES ) ), ICON_POS_SAMPLES );
     pEntry->SetUserData( new String( aSamplesFolderRootURL ) );
     pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_SAMPLES_HELP ) ) );
     DBG_ASSERT( !pEntry->GetBoundRect().IsEmpty(), "empty rectangle" );
@@ -569,16 +568,19 @@ ULONG SvtIconWindow_Impl::GetRootPos( const String& rURL ) const
     return nPos;
 }
 
+/******
+ * @param _bHiContrast: unused and noop. FIXME: remove me
+ */
 void SvtIconWindow_Impl::UpdateIcons( sal_Bool _bHiContrast )
 {
     aIconCtrl.GetEntry( ICON_POS_NEWDOC )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_NEWDOC_HC : IMG_SVT_NEWDOC ) ) );
+        Image( SvtResId( IMG_SVT_NEWDOC ) ) );
     aIconCtrl.GetEntry( ICON_POS_TEMPLATES )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_TEMPLATES_HC : IMG_SVT_TEMPLATES ) ) );
+        Image( SvtResId( IMG_SVT_TEMPLATES ) ) );
     aIconCtrl.GetEntry( ICON_POS_MYDOCS )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_MYDOCS_HC : IMG_SVT_MYDOCS ) ) );
+        Image( SvtResId( IMG_SVT_MYDOCS ) ) );
     aIconCtrl.GetEntry( ICON_POS_SAMPLES )->SetImage(
-        Image( SvtResId( _bHiContrast ? IMG_SVT_SAMPLES_HC : IMG_SVT_SAMPLES ) ) );
+        Image( SvtResId( IMG_SVT_SAMPLES ) ) );
 }
 /* -----------------27.11.2002 16:58-----------------
  *
@@ -1341,24 +1343,23 @@ void SvtTemplateWindow::InitToolBoxImages()
 {
     SvtMiscOptions aMiscOpt;
     BOOL bLarge = aMiscOpt.AreCurrentSymbolsLarge();
-    sal_Bool bHiContrast = aFileViewTB.GetSettings().GetStyleSettings().GetHighContrastMode();
 
     aFileViewTB.SetItemImage( TI_DOCTEMPLATE_BACK, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_BACK_LARGE : IMG_SVT_DOCTEMPLATE_BACK_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_BACK_SMALL : IMG_SVT_DOCTEMPLATE_BACK_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_BACK_LARGE
+               : IMG_SVT_DOCTEMPLATE_BACK_SMALL ) ) );
     aFileViewTB.SetItemImage( TI_DOCTEMPLATE_PREV, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREV_LARGE : IMG_SVT_DOCTEMPLATE_PREV_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREV_SMALL : IMG_SVT_DOCTEMPLATE_PREV_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_PREV_LARGE
+               : IMG_SVT_DOCTEMPLATE_PREV_SMALL ) ) );
     aFileViewTB.SetItemImage( TI_DOCTEMPLATE_PRINT, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_PRINT_LARGE : IMG_SVT_DOCTEMPLATE_PRINT_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_PRINT_SMALL : IMG_SVT_DOCTEMPLATE_PRINT_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_PRINT_LARGE
+               : IMG_SVT_DOCTEMPLATE_PRINT_SMALL ) ) );
 
     aFrameWinTB.SetItemImage( TI_DOCTEMPLATE_DOCINFO, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE : IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL : IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE
+               : IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL ) ) );
     aFrameWinTB.SetItemImage( TI_DOCTEMPLATE_PREVIEW, Image( SvtResId(
-        bLarge ? bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE : IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE
-               : bHiContrast ? IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL : IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL ) ) );
+        bLarge ? IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE
+               : IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL ) ) );
 }
 
 // ------------------------------------------------------------------------
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index b020850..421d708 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -52,12 +52,6 @@ Image IMG_SVT_NEWDOC
     MaskColor = MASK_COL_MAGENTA
 };
 
-Image IMG_SVT_NEWDOC_HC
-{
-    ImageBitmap = Bitmap { File = "new_doc_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
 String STR_SVT_MYDOCS
 {
     Text [ en-US ] = "My Documents";
@@ -69,12 +63,6 @@ Image IMG_SVT_MYDOCS
     MaskColor = MASK_COL_MAGENTA
 };
 
-Image IMG_SVT_MYDOCS_HC
-{
-    ImageBitmap = Bitmap { File = "my_docs_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
 String STR_SVT_TEMPLATES
 {
     Text [ en-US ] = "Templates";
@@ -86,12 +74,6 @@ Image IMG_SVT_TEMPLATES
     MaskColor = MASK_COL_MAGENTA
 };
 
-Image IMG_SVT_TEMPLATES_HC
-{
-    ImageBitmap = Bitmap { File = "template_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
 String STR_SVT_SAMPLES
 {
     Text [ en-US ] = "Samples";
@@ -103,12 +85,6 @@ Image IMG_SVT_SAMPLES
     MaskColor = MASK_COL_MAGENTA
 };
 
-Image IMG_SVT_SAMPLES_HC
-{
-    ImageBitmap = Bitmap { File = "samples_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-
 ToolBox TB_SVT_FILEVIEW
 {
     Pos = MAP_APPFONT ( 0 , 0 ) ;
@@ -170,36 +146,6 @@ Image IMG_SVT_DOCTEMPLATE_PRINT_LARGE
     ImageBitmap = Bitmap { File = "lc05509.bmp" ; };
     MaskColor = MASK_COL_MAGENTA
 };
-Image IMG_SVT_DOCTEMPL_HC_BACK_SMALL
-{
-    ImageBitmap = Bitmap { File = "back_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_BACK_LARGE
-{
-    ImageBitmap = Bitmap { File = "back_large_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREV_SMALL
-{
-    ImageBitmap = Bitmap { File = "up_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREV_LARGE
-{
-    ImageBitmap = Bitmap { File = "up_large_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PRINT_SMALL
-{
-    ImageBitmap = Bitmap { File = "sch05509.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PRINT_LARGE
-{
-    ImageBitmap = Bitmap { File = "lch05509.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
 
 ToolBox TB_SVT_FRAMEWIN
 {
@@ -246,26 +192,6 @@ Image IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE
     ImageBitmap = Bitmap { File = "preview_large.bmp" ; };
     MaskColor = MASK_COL_MAGENTA
 };
-Image IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL
-{
-    ImageBitmap = Bitmap { File = "info_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE
-{
-    ImageBitmap = Bitmap { File = "info_large_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL
-{
-    ImageBitmap = Bitmap { File = "preview_small_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
-Image IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE
-{
-    ImageBitmap = Bitmap { File = "preview_large_h.bmp" ; };
-    MaskColor = MASK_COL_MAGENTA
-};
 
 ModalDialog DLG_DOCTEMPLATE
 {
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 37b01f3..ada48f9 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -762,11 +762,9 @@ void FontNameBox::DataChanged( const DataChangedEvent& rDCEvt )
 
 void FontNameBox::InitBitmaps( void )
 {
-    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
-
-    maImagePrinterFont = Image( SvtResId( bHC? RID_IMG_PRINTERFONT_HC : RID_IMG_PRINTERFONT ) );
-    maImageBitmapFont = Image( SvtResId( bHC? RID_IMG_BITMAPFONT_HC : RID_IMG_BITMAPFONT ) );
-    maImageScalableFont = Image( SvtResId( bHC? RID_IMG_SCALABLEFONT_HC : RID_IMG_SCALABLEFONT ) );
+    maImagePrinterFont = Image( SvtResId( RID_IMG_PRINTERFONT ) );
+    maImageBitmapFont = Image( SvtResId( RID_IMG_BITMAPFONT ) );
+    maImageScalableFont = Image( SvtResId( RID_IMG_SCALABLEFONT ) );
 }
 
 // -------------------------------------------------------------------
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 5ddedbe..cd75507 100755
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.src
@@ -37,43 +37,25 @@ IMAGE RID_IMG_SCALABLEFONT
     MaskColor = IMAGE_STDBTN_COLOR ;
 };
 
-IMAGE RID_IMG_SCALABLEFONT_HC
-{
-    ImageBitmap = Bitmap { File = "scalfont_h.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
-};
-
 IMAGE RID_IMG_PRINTERFONT
 {
     ImageBitmap = Bitmap { File = "prnfont.bmp" ; };
     MaskColor = IMAGE_STDBTN_COLOR ;
 };
 
-IMAGE RID_IMG_PRINTERFONT_HC
-{
-    ImageBitmap = Bitmap { File = "prnfont_h.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
-};
-
 IMAGE RID_IMG_BITMAPFONT
 {
     ImageBitmap = Bitmap { File = "bmpfont.bmp" ; };
     MaskColor = IMAGE_STDBTN_COLOR ;
 };
 
-IMAGE RID_IMG_BITMAPFONT_HC
-{
-    ImageBitmap = Bitmap { File = "bmpfont_h.bmp" ; };
-    MaskColor = IMAGE_STDBTN_COLOR ;
-};
-
 String STR_SVT_AUTOMATIC_COLOR
 {
     Text [ en-US ] = "Automatic";
 };
 
 /*
- * ressources for CollatorRessource / CollatorRessourceData resp.
+ * resources for CollatorRessource / CollatorRessourceData resp.
  */
 
 String STR_SVT_COLLATE_ALPHANUMERIC
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 36c69f8..cd0657e 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -165,16 +165,10 @@ PrintDialog::~PrintDialog()
 
 void PrintDialog::ImplSetImages()
 {
-    if( ! GetSettings().GetStyleSettings().GetHighContrastMode() )
-    {
-        maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE ) ), BMP_COLOR_NORMAL );
-        maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE ) ), BMP_COLOR_NORMAL );
-    }
-    else
-    {
-        maImgCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_COLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
-        maImgNotCollate.SetModeImage( Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
-    }
+    maImgCollate.SetModeImage(Image( SvtResId( RID_IMG_PRNDLG_COLLATE ) ),
+                              BMP_COLOR_NORMAL );
+    maImgNotCollate.SetModeImage(Image( SvtResId( RID_IMG_PRNDLG_NOCOLLATE ) ),
+                                 BMP_COLOR_NORMAL );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
index d110c10..7a33edd 100644
--- a/svtools/source/dialogs/printdlg.src
+++ b/svtools/source/dialogs/printdlg.src
@@ -287,47 +287,3 @@ Image RID_IMG_PRNDLG_NOCOLLATE
     ImageBitmap = Bitmap { File = "ncollate.bmp" ; };
     MaskColor = IMAGE_MAGENTA_MASK ;
 };
-
-Image RID_IMG_PRNDLG_COLLATE_HC
-{
-    ImageBitmap = Bitmap { File = "collate_h.bmp" ; };
-    MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-Image RID_IMG_PRNDLG_NOCOLLATE_HC
-{
-    ImageBitmap = Bitmap { File = "ncollate_h.bmp" ; };
-    MaskColor = IMAGE_MAGENTA_MASK ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/toolpanel/toolpanel.src b/svtools/source/toolpanel/toolpanel.src
index 32594b8..3641a5d 100644
--- a/svtools/source/toolpanel/toolpanel.src
+++ b/svtools/source/toolpanel/toolpanel.src
@@ -41,17 +41,7 @@ Image IMG_TRIANGLE_RIGHT
     ImageBitmap = Bitmap { File = "triangle_right.png"; };
 };
 
-Image IMG_TRIANGLE_RIGHT_HC
-{
-    ImageBitmap = Bitmap { File = "triangle_right_hc.png"; };
-};
-
 Image IMG_TRIANGLE_DOWN
 {
     ImageBitmap = Bitmap { File = "triangle_down.png"; };
 };
-
-Image IMG_TRIANGLE_DOWN_HC
-{
-    ImageBitmap = Bitmap { File = "plus.png"; } ;
-};
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index ffc75be..abf6ce5 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -159,25 +159,18 @@ namespace svt
         return aExpansionIndicatorArea;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Image ToolPanelDrawer::impl_getExpansionIndicator() const
     {
-        const bool bHighContrastMode( GetSettings().GetStyleSettings().GetHighContrastMode() != 0 );
         USHORT nResourceId = 0;
         if ( m_bExpanded )
-            if ( bHighContrastMode )
-                nResourceId = IMG_TRIANGLE_DOWN_HC;
-            else
-                nResourceId = IMG_TRIANGLE_DOWN;
+            nResourceId = IMG_TRIANGLE_DOWN;
         else
-            if ( bHighContrastMode )
-                nResourceId = IMG_TRIANGLE_RIGHT_HC;
-            else
-                nResourceId = IMG_TRIANGLE_RIGHT;
+            nResourceId = IMG_TRIANGLE_RIGHT;
         return Image( SvtResId( nResourceId ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     USHORT ToolPanelDrawer::impl_getTextStyle() const
     {
         const USHORT nBasicStyle =  TEXT_DRAW_LEFT
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 20ba1cb..542100f 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -105,29 +105,16 @@ Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
     File = "radiomono.bmp";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_MSGBOX
 {
     File = "msgbox.png";
 };
 
-// -----------------------------------------------------------------------
-
-Bitmap SV_RESID_BITMAP_MSGBOX_HC
-{
-    File = "msgbox_hc.png";
-};
-
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_PIN
 {
     File = "pin.bmp";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_CLOSEDOC
 {
     File = "closedoc.bmp";
@@ -138,8 +125,6 @@ Bitmap SV_RESID_BITMAP_CLOSEDOCHC
     File = "closedochc.bmp";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap SV_RESID_BITMAP_SPLITHPIN
 {
     File = "splhpin.bmp";
@@ -160,8 +145,6 @@ Bitmap SV_RESID_BITMAP_SPLITVARW
     File = "splvarw.bmp";
 };
 
-// -----------------------------------------------------------------------
-
 Bitmap (SV_ICON_SIZE48_START)
 {
     File = "mainapp_48_8.png" ;
@@ -460,16 +443,6 @@ Bitmap (SV_ICON_SMALL_START)
     File = "mainapp_16.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START)
-{
-    File = "mainapp_32_h.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START)
-{
-    File = "mainapp_16_h.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_OFFICE)
 {
     File = "mainapp_32.png" ;
@@ -480,16 +453,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_OFFICE)
     File = "mainapp_16.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_32_h.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_OFFICE)
-{
-    File = "mainapp_16_h" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEXT)
 {
     File = "lx03251.png" ;
@@ -500,16 +463,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEXT)
     File = "sx03251.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEXT)
-{
-    File = "lxh03251.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEXT)
-{
-    File = "sxh03251.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEXT_TEMPLATE)
 {
     File = "lx03255.png" ;
@@ -520,16 +473,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEXT_TEMPLATE)
     File = "sx03255.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "lxh03255.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEXT_TEMPLATE)
-{
-    File = "sxh03255.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_SPREADSHEET)
 {
     File = "lx03250.png" ;
@@ -540,16 +483,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_SPREADSHEET)
     File = "sx03250.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_SPREADSHEET)
-{
-    File = "lxh03250.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_SPREADSHEET)
-{
-    File = "sxh03250.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
 {
     File = "lx03254.png" ;
@@ -560,16 +493,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
     File = "sx03254.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "lxh03254.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
-{
-    File = "sxh03254.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DRAWING)
 {
     File = "lx03246.png" ;
@@ -580,16 +503,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING)
     File = "sx03246.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DRAWING)
-{
-    File = "lxh03246.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DRAWING)
-{
-    File = "sxh03246.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DRAWING_TEMPLATE)
 {
     File = "lx03252.png" ;
@@ -600,16 +513,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DRAWING_TEMPLATE)
     File = "sx03252.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
-    File = "lxh03252.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DRAWING_TEMPLATE)
-{
-    File = "sxh03252.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION)
 {
     File = "lx03249.png" ;
@@ -620,16 +523,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION)
     File = "sx03249.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION)
-{
-    File = "lxh03249.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION)
-{
-    File = "sxh03249.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
 {
     File = "lx03253.png" ;
@@ -640,16 +533,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
     File = "sx03253.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
-{
-    File = "lxh03253.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION_TEMPLATE)
-{
-    File = "sxh03253.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
 {
     File = "lx03241.png" ;
@@ -660,16 +543,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
     File = "sx03241.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
-{
-    File = "lxh03241.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRESENTATION_COMPRESSED)
-{
-    File = "sxh03241.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MASTER_DOCUMENT)
 {
     File = "lx03248.png" ;
@@ -680,16 +553,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MASTER_DOCUMENT)
     File = "sx03248.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "lxh03248.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_MASTER_DOCUMENT)
-{
-    File = "sxh03248.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_HTML_DOCUMENT)
 {
     File = "lx03139.png" ;
@@ -700,16 +563,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_HTML_DOCUMENT)
     File = "sx03139.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-    File = "lxh03139.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_HTML_DOCUMENT)
-{
-    File = "sxh03139.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_CHART)
 {
     File = "lx03128.png" ;
@@ -720,16 +573,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_CHART)
     File = "sx03128.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_CHART)
-{
-    File = "lxh03128.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_CHART)
-{
-    File = "sxh03128.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_DATABASE)
 {
     File = "lx03245.png" ;
@@ -740,16 +583,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_DATABASE)
     File = "sx03245.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_DATABASE)
-{
-    File = "lxh03245.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_DATABASE)
-{
-    File = "sxh03245.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_FORMULA)
 {
     File = "lx03247.png" ;
@@ -760,16 +593,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_FORMULA)
     File = "sx03247.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_FORMULA)
-{
-    File = "lxh03247.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_FORMULA)
-{
-    File = "sxh03247.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_TEMPLATE)
 {
     File = "lx03242.png" ;
@@ -780,16 +603,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_TEMPLATE)
     File = "sx03242.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_TEMPLATE)
-{
-    File = "lxh03242.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_TEMPLATE)
-{
-    File = "sxh03242.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_MACRO)
 {
     File = "lx03216.png" ;
@@ -800,16 +613,6 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_MACRO)
     File = "sx03216.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_MACRO)
-{
-    File = "lxh03216.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_MACRO)
-{
-    File = "sxh03216.png" ;
-};
-
 Bitmap (SV_ICON_LARGE_START + SV_ICON_ID_PRINTERADMIN)
 {
     File = "printeradmin_32.png" ;
@@ -820,33 +623,13 @@ Bitmap (SV_ICON_SMALL_START + SV_ICON_ID_PRINTERADMIN)
     File = "printeradmin_16.png" ;
 };
 
-Bitmap (SV_ICON_LARGE_HC_START + SV_ICON_ID_PRINTERADMIN)
-{
-    File = "printeradmin_32_h.png" ;
-};
-
-Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRINTERADMIN)
-{
-    File = "printeradmin_16_h.png" ;
-};
-
 Bitmap SV_DISCLOSURE_PLUS
 {
     File = "plus.png";
 };
 
-Bitmap SV_DISCLOSURE_PLUS_HC
-{
-    File = "plus_sch.png";
-};
-
 Bitmap SV_DISCLOSURE_MINUS
 {
     File = "minus.png";
 };
 
-Bitmap SV_DISCLOSURE_MINUS_HC
-{
-    File = "minus_sch.png";
-};
-
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index 3451902..4901bdb 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -397,16 +397,6 @@ ModalDialog SV_DLG_PRINT
         {
             ImageBitmap = Bitmap { File = "ncollate.png" ; };
         };
-        
-        Image SV_PRINT_COLLATE_HC_IMG
-        {
-            ImageBitmap = Bitmap { File = "collate_h.png" ; };
-        };
-        
-        Image SV_PRINT_NOCOLLATE_HC_IMG
-        {
-            ImageBitmap = Bitmap { File = "ncollate_h.png" ; };
-        };
     };
 
     TabPage SV_PRINT_TAB_OPT


More information about the Libreoffice-commits mailing list