diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:50:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:50:42 +0000 |
| commit | 993026757d562845d6995b2b26cebf13922075cd (patch) | |
| tree | aaf9d7fe325a988701f18fb918879ae1c81b9f65 /basic | |
| parent | 2ee5b7d119021c3799eacdc116e0c8d9541a5fdb (diff) | |
INTEGRATION: CWS fixgh (1.16.20); FILE MERGED
2004/08/02 11:58:22 gh 1.16.20.1: #i26338# image for qaerrorlog background
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/app/msgedit.cxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index 7e10c64ce8cc..e76a5ba544f0 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: msgedit.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2004-06-17 11:47:06 $ + * last change: $Author: hr $ $Date: 2004-08-02 15:50:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -931,7 +931,7 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, Font aOldFont( rDev.GetFont()); Font aFont( aOldFont ); - if ( ( aFeatures & HasError ) != 0 || ( aFeatures & HasWarning ) != 0 || ( aFeatures & HasQAError ) != 0 ) + if ( ( aFeatures & HasError ) != 0 || ( aFeatures & HasWarning ) != 0 ) { Color aCol; if ( ( aFeatures & HasError ) == HasError ) @@ -949,7 +949,7 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, aFont.SetTransparent( FALSE ); } } - else // also HasAssertion + else // so its HasAssertion or HasQAError { if( rDev.IsSelected(pEntry) ) { @@ -961,11 +961,18 @@ void TTLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, Size aSize( rDev.GetTextWidth( GetText() ), rDev.GetTextHeight() ); Rectangle aRect( rPos, aSize ); - static Bitmap aBmp( ResId( MBP_ASSERT ) ); - static BitmapEx aBmpEx( aBmp ); - static Wallpaper aWP( aBmpEx ); + static Bitmap aAssertionBmp( ResId( MBP_ASSERT ) ); + static BitmapEx aAssertionBmpEx( aAssertionBmp ); + static Wallpaper aAssertionWP( aAssertionBmpEx ); - rDev.DrawWallpaper( aRect, aWP ); + static Bitmap aQAErrorBmp( ResId( MBP_QAERROR ) ); + static BitmapEx aQAErrorBmpEx( aQAErrorBmp ); + static Wallpaper aQAErrorWP( aQAErrorBmpEx ); + + if ( ( aFeatures & HasAssertion ) == HasAssertion ) + rDev.DrawWallpaper( aRect, aAssertionWP ); + else // HasQAError + rDev.DrawWallpaper( aRect, aQAErrorWP ); } // virtual void NotifyScrolling( long nLines ); |