From 9d6314c5ecb057361b7a4d932c9cffd9b05fc1cb Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Sat, 13 Nov 2010 00:33:43 -0800 Subject: [PATCH] Purged BmpColorMode from libs-gui - components --- basctl/inc/basidesh.hrc | 1 - basctl/source/basicide/baside2b.cxx | 13 ---- basctl/source/basicide/baside3.cxx | 14 ++-- basctl/source/basicide/basidesh.src | 37 +--------- 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 -- cui/source/inc/cuires.hrc | 2 - cui/source/tabpages/dstribut.cxx | 37 ++++------ cui/source/tabpages/dstribut.hrc | 9 --- cui/source/tabpages/dstribut.src | 82 --------------------- cui/source/tabpages/numfmt.cxx | 6 -- cui/source/tabpages/numfmt.hrc | 1 - cui/source/tabpages/numfmt.src | 12 --- cui/source/tabpages/tabarea.src | 73 ------------------ cui/source/tabpages/tpbitmap.cxx | 2 - cui/source/tabpages/tpcolor.cxx | 3 - cui/source/tabpages/tpgradnt.cxx | 3 - cui/source/tabpages/tphatch.cxx | 3 - cui/source/tabpages/tplnedef.cxx | 60 --------------- cui/source/tabpages/tplneend.cxx | 45 ----------- extensions/source/propctrlr/browserline.cxx | 17 ++--- extensions/source/propctrlr/browserline.hxx | 2 +- 30 files changed, 35 insertions(+), 474 deletions(-) diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index c35b785c607b..eba35852b8b1 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -60,7 +60,6 @@ #define RID_IMGBTN_REMOVEWATCH ( RID_BASICIDE_START + 8 ) #define RID_IMGBTN_GOTOCALL ( RID_BASICIDE_START + 9 ) #define RID_IMGLST_LAYOUT_HC ( RID_BASICIDE_START + 14 ) -#define RID_IMG_REMOVEWATCH_HC ( RID_BASICIDE_START + 15 ) #define RID_IMG_INSTALLATION ( RID_BASICIDE_START + 20 ) #define RID_IMG_INSTALLATION_HC ( RID_BASICIDE_START + 21 ) #define RID_IMG_DOCUMENT ( RID_BASICIDE_START + 22 ) diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 2fa67b22fb48..8299fcfac775 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1223,8 +1223,6 @@ WatchWindow::WatchWindow( Window* pParent ) : aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) ); aXEdit.Show(); - aRemoveWatchButton.SetModeImage(Image(IDEResId(RID_IMG_REMOVEWATCH_HC)), - BMP_COLOR_HIGHCONTRAST); aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) ); aRemoveWatchButton.SetPosPixel( Point( nTextLen + aXEdit.GetSizePixel().Width() + 4, 2 ) ); Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() ); @@ -1535,7 +1533,6 @@ StackWindow::StackWindow( Window* pParent ) : aSz.Width() += 6; aSz.Height() += 6; aGotoCallButton.SetSizePixel( aSz ); -// aGotoCallButton.Show(); // wird vom Basic noch nicht unterstuetzt! aGotoCallButton.Hide(); // make stack window keyboard accessible @@ -1697,11 +1694,6 @@ void __EXPORT ComplexEditorWindow::Resize() aEdtWindow.SetPosSizePixel( Point( DWBORDER+aBrkSz.Width()-1, DWBORDER ), aEWSz ); aEWVScrollBar.SetPosSizePixel( Point( aOutSz.Width()-DWBORDER-nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) ); - - // Macht das EditorWindow, ausserdem hier falsch, da Pixel -// aEWVScrollBar.SetPageSize( aEWSz.Height() * 8 / 10 ); -// aEWVScrollBar.SetVisibleSize( aSz.Height() ); -// Invalidate(); } IMPL_LINK( ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar ) @@ -1845,7 +1837,6 @@ void WatchTreeListBox::RequestingChilds( SvLBoxEntry * pParent ) pChildItem->maName = aBaseName; String aIndexStr = String( RTL_CONSTASCII_USTRINGPARAM( "(" ) ); - // pChildItem->mpArray = pItem->mpArray; pChildItem->mpArrayParentItem = pItem; pChildItem->nDimLevel = nThisLevel; pChildItem->nDimCount = pItem->nDimCount; @@ -1911,14 +1902,10 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra } // Array? else if( (pArray = pItem->GetRootArray()) != NULL ) - // else if( (pArray = pItem->mpArray) != NULL ) { rbArrayElement = true; if( pParentItem->nDimLevel + 1 == pParentItem->nDimCount ) - // if( pItem->nDimLevel == pItem->nDimCount ) pSBX = pArray->Get( pItem->pIndices ); - // else - // pSBX = pArray; } } else diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 3958faa94d1c..6b1ec9cfea16 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -234,9 +234,9 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt ) void DialogWindow::Command( const CommandEvent& rCEvt ) { - if ( ( rCEvt.GetCommand() == COMMAND_WHEEL ) || - ( rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL ) || - ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL ) ) + if ( ( rCEvt.GetCommand() == COMMAND_WHEEL ) || + ( rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL ) || + ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL ) ) { HandleScrollCommand( rCEvt, GetHScrollBar(), GetVScrollBar() ); } @@ -910,8 +910,7 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent, AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_REPLACE ) ), RET_NO, 0 ); AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); - SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? - QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() ); + SetImage( QueryBox::GetStandardImage() ); } @@ -936,8 +935,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); AddButton( BUTTON_HELP, BUTTONID_HELP, BUTTONDIALOG_HELPBUTTON, 4 ); - SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? - QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() ); + SetImage( QueryBox::GetStandardImage() ); } BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName ) @@ -1032,7 +1030,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen if( bDialogAlreadyExists ) { String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_CLASH_TITLE ) ); - String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) ); + String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) ); aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName ); NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText ); diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 9b0c38d16081..9615f869f6b1 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -343,17 +343,14 @@ ImageButton RID_IMGBTN_REMOVEWATCH }; QuickHelpText [ en-US ] = "Remove Watch" ; }; -Image RID_IMG_REMOVEWATCH_HC -{ - ImageBitmap = Bitmap { File = "baswatr_h.bmp" ; }; - MASKCOLOR -}; + ImageButton RID_IMGBTN_GOTOCALL { HelpId = HID_BASICIDE_GOTOALL ; SmallStyle = TRUE ; ButtonImage = Image { ImageBitmap = Bitmap { File = "basgocl.bmp" ; }; } ; }; + String RID_STR_REMOVEWATCH { Text [ en-US ] = "Watch:" ; @@ -704,39 +701,9 @@ String RID_STR_DLGIMP_MISMATCH_TEXT #define MN_PLHELP 31 #define MN_PLTEMPLATES 11 - /* The application menu bar resource has become obsolete. You can now find the menu bar definition at: /basicide/menubar/menubar.xml. */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 ) ; diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 023d9281de94..7c27243c2d0f 100755 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -76,8 +76,6 @@ #define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967) #define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968) #define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509) -#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283) -#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284) #define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) #define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 433b5e6e2ab5..d45ba2df61ca 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -88,36 +88,27 @@ SvxDistributePage::SvxDistributePage( : SvxTabPage(pWindow, CUI_RES(RID_SVXPAGE_DISTRIBUTE), rInAttrs), meDistributeHor(eHor), meDistributeVer(eVer), - maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )), + maFlHorizontal (this, CUI_RES(FL_HORIZONTAL )), maBtnHorNone (this, CUI_RES(BTN_HOR_NONE )), maBtnHorLeft (this, CUI_RES(BTN_HOR_LEFT )), - maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )), + maBtnHorCenter (this, CUI_RES(BTN_HOR_CENTER )), maBtnHorDistance (this, CUI_RES(BTN_HOR_DISTANCE )), - maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), + maBtnHorRight (this, CUI_RES(BTN_HOR_RIGHT )), maHorLow (this, CUI_RES(IMG_HOR_LOW )), - maHorCenter (this, CUI_RES(IMG_HOR_CENTER )), + maHorCenter (this, CUI_RES(IMG_HOR_CENTER )), maHorDistance (this, CUI_RES(IMG_HOR_DISTANCE )), maHorHigh (this, CUI_RES(IMG_HOR_HIGH )), maFlVertical (this, CUI_RES(FL_VERTICAL )), maBtnVerNone (this, CUI_RES(BTN_VER_NONE )), maBtnVerTop (this, CUI_RES(BTN_VER_TOP )), - maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )), + maBtnVerCenter (this, CUI_RES(BTN_VER_CENTER )), maBtnVerDistance (this, CUI_RES(BTN_VER_DISTANCE )), - maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), - maVerLow (this, CUI_RES(IMG_VER_LOW )), - maVerCenter (this, CUI_RES(IMG_VER_CENTER )), - maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), - maVerHigh (this, CUI_RES(IMG_VER_HIGH )) + maBtnVerBottom (this, CUI_RES(BTN_VER_BOTTOM )), + maVerLow (this, CUI_RES(IMG_VER_LOW )), + maVerCenter (this, CUI_RES(IMG_VER_CENTER )), + maVerDistance (this, CUI_RES(IMG_VER_DISTANCE )), + maVerHigh (this, CUI_RES(IMG_VER_HIGH )) { - maHorLow.SetModeImage( Image( CUI_RES( IMG_HOR_LOW_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorCenter.SetModeImage( Image( CUI_RES( IMG_HOR_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorDistance.SetModeImage( Image( CUI_RES( IMG_HOR_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST ); - maHorHigh.SetModeImage( Image( CUI_RES( IMG_HOR_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerDistance.SetModeImage( Image( CUI_RES( IMG_VER_DISTANCE_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerLow.SetModeImage( Image( CUI_RES( IMG_VER_LOW_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerCenter.SetModeImage( Image( CUI_RES( IMG_VER_CENTER_H ) ), BMP_COLOR_HIGHCONTRAST ); - maVerHigh.SetModeImage( Image( CUI_RES( IMG_VER_HIGH_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); } @@ -180,11 +171,11 @@ void __EXPORT SvxDistributePage::Reset(const SfxItemSet& ) switch(meDistributeHor) { - case SvxDistributeHorizontalNone : maBtnHorNone.SetState(TRUE); break; - case SvxDistributeHorizontalLeft : maBtnHorLeft.SetState(TRUE); break; - case SvxDistributeHorizontalCenter : maBtnHorCenter.SetState(TRUE); break; + case SvxDistributeHorizontalNone : maBtnHorNone.SetState(TRUE); break; + case SvxDistributeHorizontalLeft : maBtnHorLeft.SetState(TRUE); break; + case SvxDistributeHorizontalCenter : maBtnHorCenter.SetState(TRUE); break; case SvxDistributeHorizontalDistance : maBtnHorDistance.SetState(TRUE); break; - case SvxDistributeHorizontalRight : maBtnHorRight.SetState(TRUE); break; + case SvxDistributeHorizontalRight : maBtnHorRight.SetState(TRUE); break; } maBtnVerNone.SetState(FALSE); diff --git a/cui/source/tabpages/dstribut.hrc b/cui/source/tabpages/dstribut.hrc index 201fac2b5227..564d7d8c3d64 100644 --- a/cui/source/tabpages/dstribut.hrc +++ b/cui/source/tabpages/dstribut.hrc @@ -44,12 +44,3 @@ #define IMG_VER_CENTER 19 #define IMG_VER_DISTANCE 20 #define IMG_VER_HIGH 21 - -#define IMG_HOR_LOW_H 22 -#define IMG_HOR_CENTER_H 23 -#define IMG_HOR_DISTANCE_H 24 -#define IMG_HOR_HIGH_H 25 -#define IMG_VER_LOW_H 26 -#define IMG_VER_CENTER_H 27 -#define IMG_VER_DISTANCE_H 28 -#define IMG_VER_HIGH_H 29 diff --git a/cui/source/tabpages/dstribut.src b/cui/source/tabpages/dstribut.src index 18e38fd5236a..30746cbc72bc 100644 --- a/cui/source/tabpages/dstribut.src +++ b/cui/source/tabpages/dstribut.src @@ -204,88 +204,6 @@ TabPage RID_SVXPAGE_DISTRIBUTE }; }; - - Image IMG_HOR_LOW_H - { - ImageBitmap = Bitmap { File = "dsth_low_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_DISTANCE_H - { - ImageBitmap = Bitmap { File = "dsth_dst_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_CENTER_H - { - ImageBitmap = Bitmap { File = "dsth_cen_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_HOR_HIGH_H - { - ImageBitmap = Bitmap { File = "dsth_hig_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_HIGH_H - { - ImageBitmap = Bitmap { File = "dstv_hig_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_CENTER_H - { - ImageBitmap = Bitmap { File = "dstv_cen_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_DISTANCE_H - { - ImageBitmap = Bitmap { File = "dstv_dst_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - - Image IMG_VER_LOW_H - { - ImageBitmap = Bitmap { File = "dstv_low_h.bmp" ; }; - MaskColor = STD_MASKCOLOR ; - }; - }; // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 8ce06eb1b3e7..0a93e86b637f 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -308,7 +308,6 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage() void SvxNumberFormatTabPage::Init_Impl() { ImageList aIconList( CUI_RES_PLAIN ( IL_ICON ) ); - ImageList aIconListHC( CUI_RES_PLAIN ( IL_ICON_HC ) ); bNumItemFlag=TRUE; bOneAreaFlag=FALSE; @@ -321,13 +320,8 @@ void SvxNumberFormatTabPage::Init_Impl() nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight; aIbAdd. SetModeImage( aIconList.GetImage( IID_ADD ) ); - aIbAdd. SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST ); - aIbRemove. SetModeImage( aIconList.GetImage( IID_REMOVE ) ); - aIbRemove. SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST ); - aIbInfo. SetModeImage( aIconList.GetImage( IID_INFO ) ); - aIbInfo. SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST ); aIbAdd.Enable(FALSE ); aIbRemove.Enable(FALSE ); diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc index f863a303c800..6b72d486af41 100644 --- a/cui/source/tabpages/numfmt.hrc +++ b/cui/source/tabpages/numfmt.hrc @@ -62,7 +62,6 @@ #define IL_ICON 32 #define LB_CURRENCY 33 #define CB_SOURCEFORMAT 34 -#define IL_ICON_HC 35 #define STR_AUTO_ENTRY 36 #define TBX_ADDREMOVE 1 diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index 2538b196932c..b8c35b2d17ad 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -240,18 +240,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT }; IdCount = { 3 ; }; }; - ImageList IL_ICON_HC - { - Prefix = "nuh"; - MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; - IdList = - { - IID_ADD ; - IID_REMOVE ; - IID_INFO ; - }; - IdCount = { 3 ; }; - }; String STR_AUTO_ENTRY { diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src index f5ff6b24ff66..11be9e726a2b 100644 --- a/cui/source/tabpages/tabarea.src +++ b/cui/source/tabpages/tabarea.src @@ -1463,77 +1463,4 @@ TabDialog RID_SVXDLG_AREA }; }; -Image RID_SVXIMG_LOAD_H -{ - ImageBitmap = Bitmap - { - File = "sch05501.bmp" ; - }; - MASKCOLOR -}; - -Image RID_SVXIMG_SAVE_H -{ - ImageBitmap = Bitmap - { - File = "sch05502.bmp" ; - }; - MASKCOLOR -}; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 2b1ae42646c9..07e7177eeb3c 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -117,8 +117,6 @@ SvxBitmapTabPage::SvxBitmapTabPage aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); FreeResource(); // diese Page braucht ExchangeSupport diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 00f5fb5739cb..f370df5fd8be 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -127,9 +127,6 @@ SvxColorTabPage::SvxColorTabPage eCM ( CM_RGB ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index ef48bbbe9483..59f15ca6e4a0 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -108,9 +108,6 @@ SvxGradientTabPage::SvxGradientTabPage aXFillAttr ( pXPool ), rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 3ff6cb8134be..eda595a7f40c 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -104,9 +104,6 @@ SvxHatchTabPage::SvxHatchTabPage rXFSet ( aXFillAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 4aeb0959456e..824b4e2a5ec2 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -109,9 +109,6 @@ SvxLineDefTabPage::SvxLineDefTabPage aXLineAttr ( pXPool ), rXLSet ( aXLineAttr.GetItemSet() ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -210,16 +207,6 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& ) aURL.Append( pDashList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aFTLinestyle.SetText( aString ); -*/ *pPageType = 0; // 2 *pPosDashLb = LISTBOX_ENTRY_NOTFOUND; } @@ -274,21 +261,17 @@ void SvxLineDefTabPage::CheckChanges_Impl() case RET_BTN_1: // Aendern { ClickModifyHdl_Impl( this ); - //aXDash = pDashList->Get( nPos )->GetDash(); } break; case RET_BTN_2: // Hinzufuegen { ClickAddHdl_Impl( this ); - //nPos = aLbLineStyles.GetSelectEntryPos(); - //aXDash = pDashList->Get( nPos )->GetDash(); } break; case RET_CANCEL: break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -310,8 +293,6 @@ BOOL SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) { if( *pPageType == 2 ) { - //CheckChanges_Impl(); - FillDash_Impl(); String aString( aLbLineStyles.GetSelectEntry() ); @@ -820,21 +801,6 @@ IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pDashList->SetName( aURL.getName() ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLinestyles.SetText( aString ); -*/ // Flag fuer gewechselt setzen *pnDashListState |= CT_CHANGED; // Flag fuer modifiziert entfernen @@ -898,21 +864,6 @@ IMPL_LINK( SvxLineDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pDashList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLinestyles.SetText( aString ); -*/ // Flag fuer gespeichert setzen *pnDashListState |= CT_SAVED; // Flag fuer modifiziert entfernen @@ -934,14 +885,6 @@ void SvxLineDefTabPage::FillDash_Impl() { XDashStyle eXDS; -/* Alle Stile werden z.Z. nicht benutzt - if( aRbtEnds1.IsChecked() ) - eXDS = XDASH_ROUND; - else if( aRbtEnds2.IsChecked() ) - eXDS = XDASH_RECT; - else - eXDS = XDASH_RECT; -*/ if( aCbxSynchronize.IsChecked() ) eXDS = XDASH_RECTRELATIVE; else @@ -973,14 +916,11 @@ void SvxLineDefTabPage::FillDialog_Impl() aCbxSynchronize.Check( FALSE ); aNumFldNumber1.SetValue( aDash.GetDots() ); - //aMtrLength1.SetValue( aDash.GetDotLen() ); SetMetricValue( aMtrLength1, aDash.GetDotLen(), ePoolUnit ); aLbType1.SelectEntryPos( aDash.GetDotLen() == 0 ? 0 : 1 ); aNumFldNumber2.SetValue( aDash.GetDashes() ); - //aMtrLength2.SetValue( aDash.GetDashLen() ); SetMetricValue( aMtrLength2, aDash.GetDashLen(), ePoolUnit ); aLbType2.SelectEntryPos( aDash.GetDashLen() == 0 ? 0 : 1 ); - //aMtrDistance.SetValue( aDash.GetDistance() ); SetMetricValue( aMtrDistance, aDash.GetDistance(), ePoolUnit ); ChangeMetricHdl_Impl( NULL ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 68cbc76aa7a0..e2c5caac9f9c 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -105,9 +105,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage rXLSet ( aXLineAttr.GetItemSet() ), pLineEndList( NULL ) { - aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST ); - aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST ); - FreeResource(); // diese Page braucht ExchangeSupport @@ -190,20 +187,6 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& ) aURL.Append( pLineEndList->GetName() ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ *pPageType = 0; // 3 *pPosLineEndLb = LISTBOX_ENTRY_NOTFOUND; } @@ -629,20 +612,6 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) pLineEndList->SetName( aURL.getName() ); -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( ResId( RID_SVXSTR_TABLE, rMgr ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - if( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - - aGrpLineEnds.SetText( aString ); -*/ // Flag fuer gewechselt setzen *pnLineEndListState |= CT_CHANGED; // Flag fuer modifiziert entfernen @@ -705,20 +674,6 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickSaveHdl_Impl, void *, EMPTYARG ) if( pLineEndList->Save() ) { -/* // Ermitteln (evtl. abschneiden) des Namens und in - // der GroupBox darstellen - String aString( CUI_RES( RID_SVXSTR_TABLE ) ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) ); - - if ( aURL.getBase().Len() > 18 ) - { - aString += aURL.getBase().Copy( 0, 15 ); - aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) ); - } - else - aString += aURL.getBase(); - aGrpLineEnds.SetText( aString ); -*/ // Flag fuer gespeichert setzen *pnLineEndListState |= CT_SAVED; // Flag fuer modifiziert entfernen diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 894a462a8108..2a9ea8c493e8 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -412,10 +412,8 @@ namespace pcr return *rpButton; } -/** - * @param _out_rHCImage is unused now as there are no highcontrast variants - */ - void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ) + //------------------------------------------------------------------ + void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ) { try { @@ -427,7 +425,7 @@ namespace pcr aMediaProperties[0].Value <<= _rImageURL; Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); - _out_rImage = _out_rHCImage = Image( xGraphic ); + _out_rImage = Image( xGraphic ); } catch( const Exception& ) { @@ -441,12 +439,11 @@ namespace pcr PushButton& rButton( impl_ensureButton( _bPrimary ) ); OSL_PRECOND( _rImageURL.getLength(), "OBrowserLine::ShowBrowseButton: use the other version if you don't have an image!" ); - Image aImage, aHCImage; - impl_getImagesFromURL_nothrow( _rImageURL, aImage, aHCImage ); + Image aImage; + impl_getImagesFromURL_nothrow( _rImageURL, aImage ); - rButton.SetModeImage( aImage, BMP_COLOR_NORMAL ); - rButton.SetModeImage( aHCImage, BMP_COLOR_HIGHCONTRAST ); - } + rButton.SetModeImage( aImage ); + } //------------------------------------------------------------------ void OBrowserLine::ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary ) diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index fd091c712e78..2e0273c4760a 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -131,7 +131,7 @@ namespace pcr void impl_layoutComponents(); PushButton& impl_ensureButton( bool _bPrimary ); - void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ); + void impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage ); }; //............................................................................