diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:44:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:44:10 +0000 |
| commit | a94e4b3ec3f24100e28eff2e8c0cc4bc8051ae1f (patch) | |
| tree | 92cdf2ba219a24b4a1994cb9261236867924c369 /vcl/source/gdi/bitmap.cxx | |
| parent | 9a1e62217cf7645bca396934648b07291286c9da (diff) | |
INTEGRATION: CWS svp01 (1.14.56); FILE MERGED
2006/06/27 12:22:02 pl 1.14.56.2: RESYNC: (1.14-1.15); FILE MERGED
2006/05/26 14:37:14 pl 1.14.56.1: #135265# create Bitmap from SalBitmap
Diffstat (limited to 'vcl/source/gdi/bitmap.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 3e3cbb6163ef..6e6ef0972c08 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmap.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2006-06-19 19:20:12 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:44:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,6 +107,16 @@ Bitmap::Bitmap( const Bitmap& rBitmap ) : // ------------------------------------------------------------------ +Bitmap::Bitmap( SalBitmap* pSalBitmap ) +{ + mpImpBmp = new ImpBitmap(); + mpImpBmp->ImplSetSalBitmap( pSalBitmap ); + maPrefMapMode = MapMode( MAP_PIXEL ); + maPrefSize = mpImpBmp->ImplGetSize(); +} + +// ------------------------------------------------------------------ + Bitmap::Bitmap( const Size& rSizePixel, USHORT nBitCount, const BitmapPalette* pPal ) { if( rSizePixel.Width() && rSizePixel.Height() ) |