diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 12:28:00 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 12:28:00 +0000 |
| commit | bfb88aef95a8b2e3e94564c064afa46fde7e6b99 (patch) | |
| tree | 6acb2194d62a5bbd64f670dfe7e1a5323fdb5a19 /vcl/source/gdi/bitmap2.cxx | |
| parent | 59ddc371b11e29344b3fcd9d14f2b1ba359ef3e0 (diff) | |
INTEGRATION: CWS vclcleanup02 (1.4.204); FILE MERGED
2003/12/17 16:04:04 mt 1.4.204.3: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed soke windows compiler warnings
2003/12/16 18:15:14 mt 1.4.204.2: #i23061# And more cleanups...
2003/12/05 13:22:20 mt 1.4.204.1: #i23061# Code cleanups, fixed gcc WAll warnings
Diffstat (limited to 'vcl/source/gdi/bitmap2.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmap2.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx index 6a1e09c70295..30552fae105e 100644 --- a/vcl/source/gdi/bitmap2.cxx +++ b/vcl/source/gdi/bitmap2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bitmap2.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2003-04-24 13:17:58 $ + * last change: $Author: vg $ $Date: 2004-01-06 13:28:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,14 +59,6 @@ * ************************************************************************/ -#ifdef WIN -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif -#endif - -#define _SV_BITMAP_CXX - #include <tools/zcodec.hxx> #ifndef _TOOLS_NEW_HXX #include <tools/new.hxx> @@ -196,8 +188,6 @@ BOOL Bitmap::ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset ) { DIBInfoHeader aHeader; const ULONG nStmPos = rIStm.Tell(); - BitmapPalette* pPalette = NULL; - BOOL bHeaderRead = FALSE; BOOL bRet = FALSE; if( ImplReadDIBInfoHeader( rIStm, aHeader ) && aHeader.nWidth && aHeader.nHeight && aHeader.nBitCount ) @@ -665,7 +655,7 @@ BOOL Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWri BOOL Bitmap::Write( SvStream& rOStm, BOOL bCompressed, BOOL bFileHeader ) const { - BMP_ASSERT( mpImpBmp, "Empty Bitmaps can't be saved" ); + DBG_ASSERT( mpImpBmp, "Empty Bitmaps can't be saved" ); const Size aSizePix( GetSizePixel() ); BOOL bRet = FALSE; |