Purged BmpColorMode from libs-gui - base

9 files changed, 2 insertions, 158 deletions

diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 78fd8f4fdd1c..447710e4e0de 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -195,7 +195,7 @@ namespace dbaui
         SetText( sLabel );
 
         // Place icon left of text and both centered in the button.
-        SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ), BMP_COLOR_NORMAL );
+        SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ) );
         EnableImageDisplay( TRUE );
         EnableTextDisplay( TRUE );
         SetImageAlign( IMAGEALIGN_LEFT );
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index c3308fd53f9a..c58474c51462 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -107,9 +107,7 @@ OCollectionView::OCollectionView( Window * pParent
 
     m_aNewFolder.SetStyle( m_aNewFolder.GetStyle() | WB_NOPOINTERFOCUS );
     m_aUp.SetModeImage(ModuleRes(IMG_NAVIGATION_BTN_UP_SC));
-    m_aUp.SetModeImage(ModuleRes(IMG_NAVIGATION_BTN_UP_SCH),BMP_COLOR_HIGHCONTRAST);
     m_aNewFolder.SetModeImage(ModuleRes(IMG_NAVIGATION_CREATEFOLDER_SC));
-    m_aNewFolder.SetModeImage(ModuleRes(IMG_NAVIGATION_CREATEFOLDER_SCH),BMP_COLOR_HIGHCONTRAST);
 
     m_aView.SetDoubleClickHdl( LINK( this, OCollectionView, Dbl_Click_FileView ) );
     m_aView.EnableAutoResize();
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index 018893384dab..d2774d76682b 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -144,24 +144,13 @@ Image IMG_NAVIGATION_BTN_UP_SC
     ImageBitmap = Bitmap { File = "fp010"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
-Image IMG_NAVIGATION_BTN_UP_SCH
-{
-    ImageBitmap = Bitmap { File = "fph010"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
 Image IMG_NAVIGATION_CREATEFOLDER_SC
 {
     ImageBitmap = Bitmap { File = "fp015"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
-Image IMG_NAVIGATION_CREATEFOLDER_SCH
-{
-    ImageBitmap = Bitmap { File = "fph015"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
 
 String STR_ALREADYEXISTOVERWRITE
 {
     Text [ en-US ] = "The file already exists. Overwrite?" ;
 };
-
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index a359ceeb56b5..e2f41af35530 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -94,12 +94,6 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName )
     Init();
     SetCtrls();
     FreeResource();
-
-    // set Hi contrast bitmaps
-    aIB_Add.SetModeImage(       ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_AddAll.SetModeImage(    ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_Remove.SetModeImage(    ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
 }
 
 //-------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index ad401102601d..244c3545b870 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -35,62 +35,6 @@
 #define WIN_X   264
 #define WIN_Y   149
 
-Image IMG_ONE_LEFT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_left_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ALL_LEFT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_left_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ONE_RIGHT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_right_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ALL_RIGHT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_right_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
 ModalDialog DLG_DBASE_INDEXES
 {
     OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index be49adc0e518..17313a25b124 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -269,12 +269,6 @@
 #define BMP_EXCEPTION_INFO_SCH          RID_IMAGE_START + 30
 #define IMG_PKEYICON_SCH                RID_IMAGE_START + 31
 #define IMG_JOINS_H                     RID_IMAGE_START + 32
-#define IMG_ALL_LEFT_H                  RID_IMAGE_START + 33
-#define IMG_ONE_LEFT_H                  RID_IMAGE_START + 34
-#define IMG_ONE_RIGHT_H                 RID_IMAGE_START + 35
-#define IMG_ALL_RIGHT_H                 RID_IMAGE_START + 36
-#define IMG_SORTUP_H                    RID_IMAGE_START + 37
-#define IMG_SORTDOWN_H                  RID_IMAGE_START + 38
 #define IMG_FORMFOLDER_TREE_L           RID_IMAGE_START + 39
 #define IMG_REPORTFOLDER_TREE_L         RID_IMAGE_START + 40
 #define IMG_QUERYFOLDER_TREE_L          RID_IMAGE_START + 41
@@ -284,9 +278,7 @@
 #define IMG_QUERYFOLDER_TREE_LHC        RID_IMAGE_START + 45
 #define IMG_TABLEFOLDER_TREE_LHC        RID_IMAGE_START + 46
 #define IMG_NAVIGATION_BTN_UP_SC        RID_IMAGE_START + 47
-#define IMG_NAVIGATION_BTN_UP_SCH       RID_IMAGE_START + 48
 #define IMG_NAVIGATION_CREATEFOLDER_SC  RID_IMAGE_START + 49
-#define IMG_NAVIGATION_CREATEFOLDER_SCH RID_IMAGE_START + 50
 #define FORM_TREE_ICON                  RID_IMAGE_START + 51
 #define REPORT_TREE_ICON                RID_IMAGE_START + 52
 #define FORM_TREE_ICON_SCH              RID_IMAGE_START + 53
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index f14b59313b0b..78ffa59f559d 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -81,12 +81,6 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
     m_sDestText     = m_FT_TABLE_RIGHT.GetText();
     m_sDestText.AppendAscii("\n");
 
-    // set hiContrast
-    m_ibColumn_up.SetModeImage(ModuleRes(IMG_SORTUP_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_down.SetModeImage(ModuleRes(IMG_SORTDOWN_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_up_right.SetModeImage(ModuleRes(IMG_SORTUP_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_down_right.SetModeImage(ModuleRes(IMG_SORTDOWN_H),BMP_COLOR_HIGHCONTRAST);
-
     FreeResource();
 }
 // -----------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 9871c3f7d810..8f6f1c3fc319 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -562,69 +562,3 @@ String STR_INVALID_TABLE_NAME_LENGTH
 {
     Text [ en-US ] = "Please change the table name. It is too long.";
 };
-
-Image IMG_SORTUP_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sortup_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_SORTDOWN_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sortdown_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 1c0dd80e93f8..186260f20e92 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -282,8 +282,7 @@ void OTableWindow::impl_updateImage()
         return;
     }
 
-    m_aTypeImage.SetModeImage( aImage, BMP_COLOR_NORMAL );
-    m_aTypeImage.SetModeImage( aImageHC, BMP_COLOR_HIGHCONTRAST );
+    m_aTypeImage.SetModeImage( aImage );
     m_aTypeImage.Show();
 }