INTEGRATION: CWS vclcleanup02 (1.15.8); FILE MERGED

2003/12/17 16:04:47 mt 1.15.8.5: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed soke windows compiler warnings
2003/12/16 18:15:22 mt 1.15.8.4: #i23061# And more cleanups...
2003/12/10 15:59:28 mt 1.15.8.3: #i23061# VCL cleanup, removed headers, methods and types...
2003/12/05 16:43:10 mt 1.15.8.2: RESYNC: (1.15-1.16); FILE MERGED
2003/12/05 13:22:31 mt 1.15.8.1: #i23061# Code cleanups, fixed gcc WAll warnings

1 files changed, 2 insertions, 9 deletions

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index ebb58aed8646..cba657f8c760 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outdev2.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: rt $ $Date: 2003-12-01 13:20:50 $
+ *  last change: $Author: vg $ $Date: 2004-01-06 13:49:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,6 @@
  *
  ************************************************************************/
 
-#define _SV_OUTDEV2_CXX
-
 #ifndef _SV_SVSYS_HXX
 #include <svsys.h>
 #endif
@@ -1151,15 +1149,11 @@ BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) con
     {
         Bitmap aAlphaBitmap( mpAlphaVDev->GetBitmap( rSrcPt, rSize ) );
 
-#ifdef DEBUG_ONLYALPHA
-        return BitmapEx( aAlphaBitmap );
-#else
         // ensure 8 bit alpha
         if( aAlphaBitmap.GetBitCount() > 8 )
             aAlphaBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
 
         return BitmapEx(GetBitmap( rSrcPt, rSize ), AlphaMask( aAlphaBitmap ) );
-#endif
     }
     else
         return GetBitmap( rSrcPt, rSize );
@@ -1641,7 +1635,6 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
             {
                 BOOL bOldMapMode( IsMapModeEnabled() );
                 mpAlphaVDev->EnableMapMode(FALSE);
-                Point aEmptyPoint;
                 Bitmap aBitmap( mpAlphaVDev->GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
                 BitmapWriteAccess*  pW = aBitmap.AcquireWriteAccess();
                 BYTE nAlpha;