diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-28 11:31:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-28 11:31:24 +0000 |
| commit | 9d3cb37981a78cf5bc36b6cdd4a39a49b555b88a (patch) | |
| tree | 3583dac1163ea857e675d2054c49ceb512340cc7 /vcl/source/gdi/print2.cxx | |
| parent | 792bac9ba9b4751fb2703da9caa77e8406230e8d (diff) | |
INTEGRATION: CWS vcl09 (1.15.18); FILE MERGED
2003/05/28 08:43:30 rt 1.15.18.2: RESYNC: (1.15-1.16); FILE MERGED
2003/05/12 14:22:43 thb 1.15.18.1: #109548# Access to palette color only oif bitmap actually _has_ a palette
Diffstat (limited to 'vcl/source/gdi/print2.cxx')
| -rw-r--r-- | vcl/source/gdi/print2.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index f108ff95d269..e70f25bc89d3 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: print2.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: vg $ $Date: 2003-05-16 14:24:58 $ + * last change: $Author: vg $ $Date: 2003-05-28 12:31:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,7 +184,11 @@ static Bitmap ImplConvertBmpEx2Bmp( const MetaAction& rAct ) if( !pRA ) return aBmp; // what else should I do? - Color aWhite( pRA->GetBestPaletteColor( Color( COL_WHITE ) ).operator Color() ); + Color aWhite( COL_WHITE ); + + if( pRA->HasPalette() ) + aWhite = pRA->GetBestPaletteColor( Color( COL_WHITE ) ).operator Color(); + aBmp.ReleaseAccess(pRA); // did we get true white? |