diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:59:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 18:59:34 +0000 |
| commit | 784a95f8b4fe94ba98955f30d0f406cdff53511a (patch) | |
| tree | edc9e9a35c50278242efc3852ba86633e32740b4 /vcl/win | |
| parent | 2bd4648bdd5b34ad231ea4f3906147d80558075e (diff) | |
INTEGRATION: CWS warnings01 (1.6.70); FILE MERGED
2006/03/20 18:20:09 pl 1.6.70.1: #i55991# removed warnings for windows platform
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index cf4643931398..1db02b192234 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salbmp.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-09 14:04:47 $ + * last change: $Author: hr $ $Date: 2006-06-19 19:59:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -390,7 +390,7 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) { const ULONG nSize = GlobalSize( hHdl ); - if ( hCopy = GlobalAlloc( GHND, nSize ) ) + if ( (hCopy = GlobalAlloc( GHND, nSize )) != 0 ) { memcpy( (LPSTR) GlobalLock( hCopy ), (LPSTR) GlobalLock( hHdl ), nSize ); @@ -406,7 +406,7 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) WIN_GetObject( hHdl, sizeof( BITMAP ), (LPSTR) &aBmp ); // Destination-Bitmap erzeugen - if ( hCopy = CreateBitmapIndirect( &aBmp ) ) + if ( (hCopy = CreateBitmapIndirect( &aBmp )) != 0 ) { HDC hBmpDC = CreateCompatibleDC( 0 ); HBITMAP hBmpOld = (HBITMAP) SelectObject( hBmpDC, hHdl ); @@ -428,7 +428,7 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) // ------------------------------------------------------------------ -BitmapBuffer* WinSalBitmap::AcquireBuffer( bool bReadOnly ) +BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) { BitmapBuffer* pBuffer = NULL; @@ -570,7 +570,7 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, { do { - if( !( nCountByte = *pRLE++ ) ) + if( ( nCountByte = *pRLE++ ) == 0 ) { nRunByte = *pRLE++; |