Purged BmpColorMode from libs-gui - calc

5 files changed, 9 insertions, 55 deletions

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 78c1871c1e1e..74333ef21a44 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -1040,14 +1040,14 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
     getSectionPosSize(aPos, aSize, BTN_SINGLE_SELECT);
     maBtnSelectSingle.SetPosSizePixel(aPos, aSize);
     maBtnSelectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_SELECT_CURRENT).GetString());
-    maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)), BMP_COLOR_NORMAL);
+    maBtnSelectSingle.SetModeImage(Image(ScResId(RID_IMG_SELECT_CURRENT)));
     maBtnSelectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
     maBtnSelectSingle.Show();
 
     getSectionPosSize(aPos, aSize, BTN_SINGLE_UNSELECT);
     maBtnUnselectSingle.SetPosSizePixel(aPos, aSize);
     maBtnUnselectSingle.SetQuickHelpText(ScRscStrLoader(RID_POPUP_FILTER, STR_BTN_UNSELECT_CURRENT).GetString());
-    maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)), BMP_COLOR_NORMAL);
+    maBtnUnselectSingle.SetModeImage(Image(ScResId(RID_IMG_UNSELECT_CURRENT)));
     maBtnUnselectSingle.SetClickHdl( LINK(this, ScDPFieldPopupWindow, ButtonHdl) );
     maBtnUnselectSingle.Show();
 }
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 4f70376455b5..a6e10c8eb3d7 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -291,12 +291,10 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
     aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_DEL_ROWS ) );
     uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame();
     Image aDelNm = ::GetImage( xFrame, aSlotURL, FALSE, FALSE );
-    Image aDelHC = ::GetImage( xFrame, aSlotURL, FALSE, TRUE );     // high contrast
 
     for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
     {
-        mpDelButton[nRow]->SetModeImage( aDelNm, BMP_COLOR_NORMAL );
-        mpDelButton[nRow]->SetModeImage( aDelHC, BMP_COLOR_HIGHCONTRAST );
+        mpDelButton[nRow]->SetModeImage( aDelNm );
     }
 
     maBtnOpt.SetClickHdl( LINK( this, ScOptSolverDlg, BtnHdl ) );
diff --git a/sc/source/ui/pagedlg/hfedtdlg.hrc b/sc/source/ui/pagedlg/hfedtdlg.hrc
index 30e6f8ecae63..59db21f1b93b 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.hrc
+++ b/sc/source/ui/pagedlg/hfedtdlg.hrc
@@ -52,13 +52,6 @@
 
 #define FL_INFO                 14
 
-#define IMG_TEXT_H              21
-#define IMG_PAGE_H              22
-#define IMG_PAGES_H             23
-#define IMG_DATE_H              24
-#define IMG_TIME_H              25
-#define IMG_FILE_H              26
-#define IMG_TABLE_H             27
 #define FT_HF_DEFINED           28
 #define LB_DEFINED              29
 #define FT_HF_CUSTOM            30
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index 1445636e8cc6..339be43279f2 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -517,11 +517,7 @@ TabPage RID_HFBASE
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_TEXT_H
-    {
-        ImageBitmap = Bitmap { File = "text_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_FILE
     {
         HelpId = HID_SC_HF_FILE ;
@@ -535,11 +531,6 @@ TabPage RID_HFBASE
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_FILE_H
-    {
-        ImageBitmap = Bitmap { File = "file_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
 
     Menu RID_POPUP_FCOMMAND
     {
@@ -581,11 +572,7 @@ TabPage RID_HFBASE
             MaskColor = STD_MASKCOLOR;
         };
     };
-    Image IMG_TABLE_H
-    {
-        ImageBitmap = Bitmap { File = "table_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_PAGE
     {
         HelpId = HID_SC_HF_PAGE ;
@@ -599,11 +586,7 @@ TabPage RID_HFBASE
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_PAGE_H
-    {
-        ImageBitmap = Bitmap { File = "page_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_PAGES
     {
         HelpId = HID_SC_HF_PAGES ;
@@ -617,11 +600,7 @@ TabPage RID_HFBASE
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_PAGES_H
-    {
-        ImageBitmap = Bitmap { File = "pages_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_DATE
     {
         HelpId = HID_SC_HF_DATE ;
@@ -635,11 +614,7 @@ TabPage RID_HFBASE
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_DATE_H
-    {
-        ImageBitmap = Bitmap { File = "date_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     ImageButton BTN_TIME
     {
         HelpId = HID_SC_HF_TIME ;
@@ -653,11 +628,7 @@ TabPage RID_HFBASE
             MaskColor = STD_MASKCOLOR ;
         };
     };
-    Image IMG_TIME_H
-    {
-        ImageBitmap = Bitmap { File = "time_h.bmp" ; };
-        MaskColor = SC_HC_MASKCOLOR;
-    };
+
     FixedText FT_INFO
     {
         Pos = MAP_APPFONT ( 12 , 155 ) ;
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 5ea90ef0d77d..067c43c55a7e 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -140,14 +140,6 @@ ScHFEditPage::ScHFEditPage( Window*             pParent,
     aBtnFile    .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
     aBtnTable   .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
 
-    aBtnText    .SetModeImage( Image( ScResId( IMG_TEXT_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnFile    .SetModeImage( Image( ScResId( IMG_FILE_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnTable   .SetModeImage( Image( ScResId( IMG_TABLE_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnPage    .SetModeImage( Image( ScResId( IMG_PAGE_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnLastPage.SetModeImage( Image( ScResId( IMG_PAGES_H ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnDate    .SetModeImage( Image( ScResId( IMG_DATE_H  ) ), BMP_COLOR_HIGHCONTRAST );
-    aBtnTime    .SetModeImage( Image( ScResId( IMG_TIME_H  ) ), BMP_COLOR_HIGHCONTRAST );
-
     if(!bHeader)
     {
         maFtDefinedHF.SetText(ScGlobal::GetRscString( STR_FOOTER ));