From e0d9d4d4a4f77d0fbb680c2f96b1cc9a912238d2 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Sat, 13 Nov 2010 00:32:23 -0800 Subject: Purged BmpColorMode from libs-gui - calc --- sc/source/ui/pagedlg/hfedtdlg.hrc | 7 ------ sc/source/ui/pagedlg/hfedtdlg.src | 41 +++++------------------------------ sc/source/ui/pagedlg/scuitphfedit.cxx | 8 ------- 3 files changed, 6 insertions(+), 50 deletions(-) (limited to 'sc/source/ui/pagedlg') 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 )); -- cgit v1.2.3