diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:44:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:44:48 +0000 |
| commit | 61d1fd04ad56d96f8a56602f46dcb98558b2986e (patch) | |
| tree | 99d7d74b25782bf7f8b1c60b59e6f49cf498dd12 /vcl/source/gdi/image.cxx | |
| parent | b47871f019cb83fd23767f4a089cf414d9367cfd (diff) | |
INTEGRATION: CWS svp01 (1.23.82); FILE MERGED
2006/06/27 12:26:35 pl 1.23.82.2: RESYNC: (1.23-1.24); FILE MERGED
2006/05/26 14:37:47 pl 1.23.82.1: solve a compiler ambiguity
Diffstat (limited to 'vcl/source/gdi/image.cxx')
| -rw-r--r-- | vcl/source/gdi/image.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 957256802632..7303819d0f43 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -4,9 +4,9 @@ * * $RCSfile: image.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: hr $ $Date: 2006-06-19 19:24:19 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:44:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -946,7 +946,7 @@ void ImageList::AddImage( USHORT nId, const Image& rImage ) if( !bHasImage ) { const Bitmap aBmp( aImageSize, 1 ); - const BitmapEx aBmpEx( aBmp, COL_BLACK ); + const BitmapEx aBmpEx( aBmp, Color( COL_BLACK ) ); mpImplData->mpImageBitmap->Replace( nIndex, aBmpEx ); } |