diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-11-13 00:35:13 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-11-13 00:39:25 -0800 |
commit | 505409cbe575ed248cc6ade4e7f9048a08947d53 (patch) | |
tree | a520c8269e069bb3778b9f364207bdc93695e701 /formula | |
parent | Easy Hacks : RTL_CONSTASCII_USTRINGPARAM in libs-core (diff) | |
download | core-505409cbe575ed248cc6ade4e7f9048a08947d53.tar.gz core-505409cbe575ed248cc6ade4e7f9048a08947d53.zip |
Purged BmpColorMode from libs-gui - libs-core
Diffstat (limited to 'formula')
-rw-r--r-- | formula/inc/formula/funcutl.hxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/formdlgs.src | 41 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.hrc | 1 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.src | 25 | ||||
-rw-r--r-- | formula/source/ui/inc/ForResId.hrc | 4 |
7 files changed, 0 insertions, 85 deletions
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index 8f47e072018e..110084dd6419 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -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 2b98213a61e8..3fd7c3498c1a 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 41b89fd34491..0e294a284f76 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -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 e651dec89ee4..520b8ebfdbb6 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -82,7 +82,6 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos): m_sRequired ( ModuleRes( STR_REQUIRED ) ), bRefMode (FALSE) { - Image aFxHC( ModuleRes( IMG_FX_H ) ); FreeResource(); aDefaultString=aFtEditDesc.GetText(); @@ -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 f6367c6259db..e7ef4c43c5b6 100644 --- a/formula/source/ui/dlg/parawin.hrc +++ b/formula/source/ui/dlg/parawin.hrc @@ -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 eda2bfcecda9..8af91786d699 100644 --- a/formula/source/ui/dlg/parawin.src +++ b/formula/source/ui/dlg/parawin.src @@ -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 32b59f296cec..bf2e4c3f750a 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -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 |