diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-12-10 16:16:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-12-10 16:16:04 +0000 |
| commit | e0ffb74d51a13e6b78bd151ca67eae6b853332a3 (patch) | |
| tree | 5ab3d060aadde1b65b6f9c40ded4d684b428a3c7 /basic | |
| parent | 18fd4fef493ba46d53718306c79d136002938987 (diff) | |
INTEGRATION: CWS gh9 (1.17.28); FILE MERGED
2004/11/24 10:15:12 gh 1.17.28.1: #i37484#set text colors explicitly to black where needed
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/app/msgedit.cxx | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index e76a5ba544f0..4c3684dc14ca 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: msgedit.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2004-08-02 15:50:42 $ + * last change: $Author: rt $ $Date: 2004-12-10 17:16:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -926,11 +926,10 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, { TTFeatures aFeatures = ((TTTreeListBox*)&rDev)->GetFeatures( pEntry ); + Font aOldFont( rDev.GetFont()); + Font aFont( aOldFont ); if ( aFeatures != HasNothing ) { - Font aOldFont( rDev.GetFont()); - Font aFont( aOldFont ); - if ( ( aFeatures & HasError ) != 0 || ( aFeatures & HasWarning ) != 0 ) { Color aCol; @@ -947,6 +946,8 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, { aFont.SetFillColor( aCol ); aFont.SetTransparent( FALSE ); + Color aCol( COL_BLACK ); + aFont.SetColor( aCol ); } } else // so its HasAssertion or HasQAError @@ -973,16 +974,27 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, rDev.DrawWallpaper( aRect, aAssertionWP ); else // HasQAError rDev.DrawWallpaper( aRect, aQAErrorWP ); + + Color aCol( COL_BLACK ); + aFont.SetColor( aCol ); } // virtual void NotifyScrolling( long nLines ); } rDev.SetFont( aFont ); rDev.DrawText( rPos, GetText() ); - rDev.SetFont( aOldFont ); } else + { + if( !rDev.IsSelected(pEntry) ) + { + Color aCol( COL_BLACK ); + aFont.SetColor( aCol ); + } + rDev.SetFont( aFont ); SvLBoxString::Paint( rPos, rDev, nFlags, pEntry ); + } + rDev.SetFont( aOldFont ); } |