Purged BmpColorMode from libs-gui - libs-core

7 files changed, 10 insertions, 95 deletions

diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index aba20fd51c..110084dd64 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -78,9 +78,7 @@ class FORMULA_DLLPUBLIC RefButton : public ImageButton
 {
 private:
     Image               aImgRefStart;   /// Start reference input
-    Image               aImgRefStartHC; /// Start reference input (high contrast)
     Image               aImgRefDone;    /// Stop reference input
-    Image               aImgRefDoneHC;  /// Stop reference input (high contrast)
     IControlReferenceHandler*      pAnyRefDlg;     // parent dialog
     RefEdit*            pRefEdit;       // zugeordnetes Edit-Control
 
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 626f9a0f10..31c99e8ea0 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -475,15 +475,6 @@ Image RID_BMP_REFBTN1
     MaskColor = STD_MASKCOLOR;
 };
 
-Image RID_BMP_REFBTN1_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "refinp1_h.bmp";
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-
 Image RID_BMP_REFBTN2
 {
     ImageBitmap = Bitmap
@@ -492,35 +483,3 @@ Image RID_BMP_REFBTN2
     };
     MaskColor = STD_MASKCOLOR;
 };
-
-Image RID_BMP_REFBTN2_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "refinp2_h.bmp";
-    };
-    MaskColor = STD_MASKCOLOR;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index e5deee9d5b..ecff775bf6 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -1032,9 +1032,7 @@ IMPL_LINK( RefEdit, UpdateHdl, Timer*, EMPTYARG )
 RefButton::RefButton( Window* _pParent, const ResId& rResId) :
     ImageButton( _pParent, rResId ),
     aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
-    aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ),
     aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
-    aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ),
     pAnyRefDlg( NULL ),
     pRefEdit( NULL )
 {
@@ -1044,9 +1042,7 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) :
 RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, IControlReferenceHandler* _pDlg ) :
     ImageButton( _pParent, rResId ),
     aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ),
-    aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ),
     aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
-    aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ),
     pAnyRefDlg( _pDlg ),
     pRefEdit( pEdit )
 {
@@ -1056,13 +1052,11 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, ICo
 void RefButton::SetStartImage()
 {
     SetModeImage( aImgRefStart );
-    SetModeImage( aImgRefStartHC, BMP_COLOR_HIGHCONTRAST );
 }
 
 void RefButton::SetEndImage()
 {
     SetModeImage( aImgRefDone );
-    SetModeImage( aImgRefDoneHC, BMP_COLOR_HIGHCONTRAST );
 }
 
 void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit )
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index a193750b8c..597959d95a 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,7 +41,7 @@
 #include "helpids.hrc"
 #include "formula/formdata.hxx"
 #include "formula/IFunctionDescription.hxx"
-#include "ModuleHelper.hxx" 
+#include "ModuleHelper.hxx"
 #include "ForResId.hrc"
 
 #define VAR_ARGS 30
@@ -71,21 +71,20 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     aEdArg2 		( this, ModuleRes( ED_ARG2 ) ),
     aEdArg3 		( this, ModuleRes( ED_ARG3 ) ),
     aEdArg4 		( this, ModuleRes( ED_ARG4 ) ),
-    
+
     aRefBtn1		( this, ModuleRes( RB_ARG1 ) ),
     aRefBtn2		( this, ModuleRes( RB_ARG2 ) ),
     aRefBtn3		( this, ModuleRes( RB_ARG3 ) ),
     aRefBtn4		( this, ModuleRes( RB_ARG4 ) ),
-    
+
     aSlider 		( this, ModuleRes( WND_SLIDER ) ),
     m_sOptional     ( ModuleRes( STR_OPTIONAL ) ),
     m_sRequired     ( ModuleRes( STR_REQUIRED ) ),
     bRefMode		(FALSE)
 {
-    Image aFxHC( ModuleRes( IMG_FX_H ) );
     FreeResource();
     aDefaultString=aFtEditDesc.GetText();
-    
+
     SetPosPixel(aPos);
     nEdFocus=NOT_FOUND;
     nActiveLine=0;
@@ -95,11 +94,6 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos):
     aSlider.SetEndScrollHdl( LINK( this, ParaWin, ScrollHdl ) );
     aSlider.SetScrollHdl( LINK( this, ParaWin, ScrollHdl ) );
 
-    aBtnFx1.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-    aBtnFx2.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-    aBtnFx3.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-    aBtnFx4.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST );
-
     InitArgInput( 0, aFtArg1, aBtnFx1, aEdArg1, aRefBtn1);
     InitArgInput( 1, aFtArg2, aBtnFx2, aEdArg2, aRefBtn2);
     InitArgInput( 2, aFtArg3, aBtnFx3, aEdArg3, aRefBtn3);
diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc
index 484ca53937..2f8ec808a6 100644
--- a/formula/source/ui/dlg/parawin.hrc
+++ b/formula/source/ui/dlg/parawin.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,6 @@
 #define RB_ARG3				18
 #define RB_ARG4				19
 #define WND_SLIDER			20
-#define IMG_FX_H            30
 
 #define STR_OPTIONAL        1
 #define STR_REQUIRED        2
diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src
index 78be77040b..7fff42bc9c 100644
--- a/formula/source/ui/dlg/parawin.src
+++ b/formula/source/ui/dlg/parawin.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -161,29 +161,4 @@ TabPage RID_FORMULATAB_PARAMETER
     {
         Text [ en-US ] = "(required)" ;
     };
-
-    Image IMG_FX_H
-    {
-        ImageBitmap = Bitmap { File = "fx_h.bmp" ; };
-        MaskColor = STD_MASKCOLOR;
-    };
-    
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc
index a09e3fd03d..afa944f25d 100644
--- a/formula/source/ui/inc/ForResId.hrc
+++ b/formula/source/ui/inc/ForResId.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,9 +55,7 @@
 
 // bitmap
 #define RID_BMP_REFBTN1					            (RID_BITMAP_START + 0)
-#define RID_BMP_REFBTN1_H					        (RID_BITMAP_START + 1)
 #define RID_BMP_REFBTN2 					        (RID_BITMAP_START + 2)
-#define RID_BMP_REFBTN2_H					        (RID_BITMAP_START + 3)
 
 
 // pages
@@ -67,8 +65,6 @@
 #define RID_FORMULATAB_PARAMETER                    (RID_PAGE_START + 3)
 #define RID_FORMULADLG_FORMULA_MODAL                (RID_PAGE_START + 4)
 
-// misc
-
 // -----------------------------------------------------------------------
 
 #endif          // FORMULA_FORRESID_HRC