diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-03 15:07:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-03 15:07:25 +0000 |
| commit | 995a1764fa3689902dc24fb486e913bb88f44f30 (patch) | |
| tree | cab61197b95ff4976924a526a43c868be6bca725 | |
| parent | 498bdeaa2dbf7d2b50ff4c1c329edf5014fa1c12 (diff) | |
INTEGRATION: CWS dba202c (1.18.100); FILE MERGED
2005/12/01 14:20:23 oj 1.18.100.1: #i52615# set correct colors on outdev
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 378db44a8121..5f1612a13652 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ivctrl.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2005-09-08 14:53:01 $ + * last change: $Author: kz $ $Date: 2006-01-03 16:07:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -521,7 +521,7 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); Wallpaper aEmpty; if( rPaper == aEmpty ) - Control::SetBackground( rStyleSettings.GetWindowColor() ); + Control::SetBackground( rStyleSettings.GetFieldColor() ); else { Wallpaper aBackground( rPaper ); @@ -537,7 +537,7 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) aBackground.GetBitmap().IsTransparent() || (eStyle != WALLPAPER_TILE && eStyle != WALLPAPER_SCALE)))) { - aBackground.SetColor( rStyleSettings.GetWindowColor() ); + aBackground.SetColor( rStyleSettings.GetFieldColor() ); } if( aBackground.IsScrollable() ) { @@ -556,7 +556,7 @@ void SvtIconChoiceCtrl::SetBackground( const Wallpaper& rPaper ) // bei hart attributierter Textfarbe keine 'Automatik', die eine // lesbare Textfarbe einstellt. Font aFont( GetFont() ); - aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + aFont.SetColor( rStyleSettings.GetFieldTextColor() ); SetFont( aFont ); Invalidate(INVALIDATE_NOCHILDREN); |