diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-01 09:24:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-01 09:24:58 +0000 |
| commit | 4b4156fc20234999bd4ed1496d0477d541f455b5 (patch) | |
| tree | 69ea700bbe8b57d8d13bcb395937f6f24913fa84 /svtools | |
| parent | b87b56ccf800d0bc96bb69aa2a6384ee4deb19c3 (diff) | |
INTEGRATION: CWS vcl42 (1.28.356); FILE MERGED
2005/10/05 21:20:32 pl 1.28.356.2: RESYNC: (1.28-1.29); FILE MERGED
2005/07/21 14:46:54 pl 1.28.356.1: #i51953# disabled multiline edit
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/edit/svmedit.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index f551395f341c..dddc47d8d9b1 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svmedit.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: rt $ $Date: 2005-09-08 15:26:52 $ + * last change: $Author: kz $ $Date: 2005-11-01 10:24:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1022,6 +1022,8 @@ void MultiLineEdit::ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackgr Color aTextColor = rStyleSettings.GetFieldTextColor(); if ( IsControlForeground() ) aTextColor = GetControlForeground(); + if ( !IsEnabled() ) + aTextColor = rStyleSettings.GetDisableColor(); Font aFont = rStyleSettings.GetFieldFont(); if ( IsControlFont() ) @@ -1261,6 +1263,7 @@ void MultiLineEdit::StateChanged( StateChangedType nType ) if( nType == STATE_CHANGE_ENABLE ) { pImpSvMEdit->Enable( IsEnabled() ); + ImplInitSettings( TRUE, FALSE, FALSE ); } else if( nType == STATE_CHANGE_READONLY ) { |