diff options
| author | Joseph Powers <jpowers27@cox.net> | 2010-11-05 19:24:42 -0700 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-11-06 10:09:11 -0500 |
| commit | 858a431c25f7c8616c97bbe79b7cfb5913e59353 (patch) | |
| tree | 35b1fd6adb1fd753a58f823eee90fde5b9a6df3a /fpicker/source | |
| parent | 3247591e5cfa6b258e50c53673c3700b023c5088 (diff) | |
High-Contrast Cleanup Phase #1
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 11 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.src | 9 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 149a963b2e..d8873f1079 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.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 @@ -548,8 +548,7 @@ void SvtFileDialog::Init_Impl WinBits nStyle ) { - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) ); + m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) ); _pImp->_nStyle = nStyle; _pImp->_a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); @@ -2672,11 +2671,7 @@ BOOL SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& rFilter ) //----------------------------------------------------------------------------- void SvtFileDialog::implUpdateImages( ) { - // determine high contrast mode - { - sal_Bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - m_aImages = ImageList( SvtResId( bIsHighContrast ? RID_FILEPICKER_IMAGES_HC : RID_FILEPICKER_IMAGES ) ); - } + m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) ); // set the appropriate images on the buttons if ( _pImp->_pBtnUp ) diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index 413f91c5c8..249383dc8a 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.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 @@ -53,13 +53,6 @@ ImageList RID_FILEPICKER_IMAGES FILEPICKER_IL_IDLIST }; -ImageList RID_FILEPICKER_IMAGES_HC -{ - Prefix = "fph"; - MASKCOLOR - FILEPICKER_IL_IDLIST -}; - // dialogs ******************************************************************* ModalDialog DLG_SVT_EXPLORERFILE diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 6b630af9e3..fe1f8d0ef0 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.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 |