From 9d6314c5ecb057361b7a4d932c9cffd9b05fc1cb Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Sat, 13 Nov 2010 00:33:43 -0800 Subject: Purged BmpColorMode from libs-gui - components --- cui/source/dialogs/hldocntp.cxx | 1 - cui/source/dialogs/hldoctp.cxx | 4 +-- cui/source/dialogs/hlinettp.cxx | 4 +-- cui/source/dialogs/hlmailtp.cxx | 3 +-- cui/source/dialogs/hltpbase.cxx | 2 -- cui/source/dialogs/hyperdlg.hrc | 6 ----- cui/source/dialogs/hyperdlg.src | 53 ++----------------------------------- cui/source/dialogs/splitcelldlg.cxx | 2 -- cui/source/dialogs/splitcelldlg.hrc | 4 --- cui/source/dialogs/splitcelldlg.src | 8 ------ 10 files changed, 5 insertions(+), 82 deletions(-) (limited to 'cui/source/dialogs') diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 53a5d3eeb351..22075863e2da 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -124,7 +124,6 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet& maLbDocTypes ( this, CUI_RES (LB_DOCUMENT_TYPES) ) { // Set HC bitmaps and disable display of bitmap names. - maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtCreate.EnableTextDisplay (FALSE); InitStdControls(); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 095e959cdca6..b341cc3b3c40 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -64,10 +64,8 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), mbMarkWndOpen ( FALSE ) { - // Set HC bitmaps and disable display of bitmap names. - maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); + // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (FALSE); - maBtFileopen.SetModeImage( Image( CUI_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtFileopen.EnableTextDisplay (FALSE); InitStdControls(); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index f0d3cf1878e8..1d18e8f7020d 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -71,10 +71,8 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maBtTarget ( this, CUI_RES (BTN_TARGET) ), mbMarkWndOpen ( FALSE ) { - // Set HC bitmaps and display display of bitmap names. - maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST ); + // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (FALSE); - maBtTarget.SetModeImage( Image( CUI_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST ); maBtTarget.EnableTextDisplay (FALSE); InitStdControls(); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index d09491b14bbd..5312ccbdc830 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -63,8 +63,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte maFtSubject ( this, CUI_RES (FT_SUBJECT) ), maEdSubject ( this, CUI_RES (ED_SUBJECT) ) { - // Set HC bitmaps and disable display of bitmap names. - maBtAdrBook.SetModeImage( Image( CUI_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST ); + // Disable display of bitmap names. maBtAdrBook.EnableTextDisplay (FALSE); InitStdControls(); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index cd5810d5348f..e8fe442895f7 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -230,8 +230,6 @@ void SvxHyperlinkTabPageBase::InitStdControls () mpBtScript = new ImageButton ( this, ResId (BTN_SCRIPT, *m_pResMgr) ); mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); - - mpBtScript->SetModeImage( Image( ResId( IMG_SCRIPT_HC, *m_pResMgr ) ), BMP_COLOR_HIGHCONTRAST ); mpBtScript->EnableTextDisplay (FALSE); } diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc index 340117fda311..c838ffd9c20d 100644 --- a/cui/source/dialogs/hyperdlg.hrc +++ b/cui/source/dialogs/hyperdlg.hrc @@ -40,8 +40,6 @@ #define CBX_ANONYMOUS 11 #define BTN_BROWSE 12 #define BTN_TARGET 13 -#define IMG_BROWSE_HC 14 -#define IMG_TARGET_HC 15 /* Tabpage : Hyperlink - Mail & News */ @@ -53,7 +51,6 @@ #define FT_SUBJECT 6 #define ED_SUBJECT 7 #define BTN_ADRESSBOOK 8 -#define IMG_ADRESSBOOK_HC 9 /* Tabpage : Hyperlink - Document */ @@ -66,7 +63,6 @@ #define ED_TARGET_DOC 7 #define FT_URL 8 #define FT_FULL_URL 9 -#define IMG_FILEOPEN_HC 10 /* Tabpage : Hyperlink - New document */ @@ -78,7 +74,6 @@ #define FT_DOCUMENT_TYPES 6 #define LB_DOCUMENT_TYPES 7 #define BTN_CREATE 8 -#define IMG_CREATE_HC 9 /* Tabpage-section : Hyperlink - more justifications */ @@ -92,7 +87,6 @@ #define FT_TEXT 37 #define ED_TEXT 38 #define BTN_SCRIPT 39 -#define IMG_SCRIPT_HC 40 #define COL_OLD 54 #define COL_2 63 diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index ebf0320df9d5..85d30bc198e3 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -124,11 +124,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET MASKCOLOR }; }; - Image IMG_BROWSE_HC - { - ImageBitmap = Bitmap { File = "browse_hc.bmp" ; }; - MASKCOLOR - }; + ImageButton BTN_TARGET { Pos = MAP_APPFONT ( 235, 40+2 ) ; @@ -143,11 +139,7 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET MASKCOLOR }; }; - Image IMG_TARGET_HC - { - ImageBitmap = Bitmap { File = "target_hc.bmp" ; }; - MASKCOLOR - }; + FixedLine GRP_MORE { Pos = MAP_APPFONT ( 6 , 92 ) ; @@ -228,11 +220,6 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* @@ -301,11 +288,6 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL Text [ en-US ] = "Data Sources..."; QuickHelpText [ en-US ] = "Data Sources..." ; }; - Image IMG_ADRESSBOOK_HC - { - ImageBitmap = Bitmap { File = "adrbook_hc.bmp" ; }; - MASKCOLOR - }; FixedLine GRP_MORE { @@ -386,11 +368,6 @@ TabPage RID_SVXPAGE_HYPERLINK_MAIL }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* @@ -433,12 +410,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Text [ en-US ] = "Open File"; }; - Image IMG_FILEOPEN_HC - { - ImageBitmap = Bitmap { File = "fileopen_hc.bmp" ; }; - MASKCOLOR - }; - FixedLine GRP_TARGET { Pos = MAP_APPFONT ( 6 , 38 ) ; @@ -482,11 +453,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Text [ en-US ] = "Target in Document"; }; - Image IMG_BROWSE_HC - { - ImageBitmap = Bitmap { File = "target_hc.bmp" ; }; - MASKCOLOR - }; FixedLine GRP_MORE { @@ -567,11 +533,6 @@ TabPage RID_SVXPAGE_HYPERLINK_DOCUMENT }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* @@ -647,11 +608,6 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Text [ en-US ] = "Select Path"; }; - Image IMG_CREATE_HC - { - ImageBitmap = Bitmap { File = "newdoc_hc.bmp" ; }; - MASKCOLOR - }; FixedLine GRP_MORE { @@ -732,11 +688,6 @@ TabPage RID_SVXPAGE_HYPERLINK_NEWDOCUMENT }; Text [ en-US ] = "Events"; }; - Image IMG_SCRIPT_HC - { - ImageBitmap = Bitmap { File = "script_hc.bmp" ; }; - MASKCOLOR - }; }; /************************************************************************* diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index b2574fdb1e37..ffa88f5bf3c7 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -52,8 +52,6 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long , mnMaxVertical( nMaxVertical ) , mnMaxHorizontal( nMaxHorizontal ) { - maVertBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_VERT)), BMP_COLOR_HIGHCONTRAST); - maHorzBox.SetModeRadioImage(Image(CUI_RES(BMP_SPLIT_HORZ)), BMP_COLOR_HIGHCONTRAST); FreeResource(); maHorzBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); maPropCB.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); diff --git a/cui/source/dialogs/splitcelldlg.hrc b/cui/source/dialogs/splitcelldlg.hrc index 143f4685abe4..7698c9687f12 100644 --- a/cui/source/dialogs/splitcelldlg.hrc +++ b/cui/source/dialogs/splitcelldlg.hrc @@ -33,10 +33,6 @@ #define RB_VERT 12 #define FL_DIR 12 -#define BMP_SPLIT_VERT 13 -#define BMP_SPLIT_HORZ 14 - #define BT_OK 100 #define BT_CANCEL 101 #define BT_HELP 102 - diff --git a/cui/source/dialogs/splitcelldlg.src b/cui/source/dialogs/splitcelldlg.src index b8f623f8bfe4..9f435e3169b7 100644 --- a/cui/source/dialogs/splitcelldlg.src +++ b/cui/source/dialogs/splitcelldlg.src @@ -102,14 +102,6 @@ ModalDialog RID_SVX_SPLITCELLDLG Size = MAP_APPFONT ( 91 , 12 ) ; Text [ en-US ] = "~Into equal proportions"; }; - Image BMP_SPLIT_VERT - { - ImageBitmap = Bitmap { File = "zetlver2_h.bmp" ; }; - }; - Image BMP_SPLIT_HORZ - { - ImageBitmap = Bitmap { File = "zetlhor2_h.bmp" ; }; - }; ImageRadioButton RB_VERT { Pos = MAP_APPFONT ( 12 , 84 ) ; -- cgit