removetooltypes: #i112600# some more changes in vcl and tools, reverted config strings in l10ntools and rsc

1 files changed, 69 insertions, 69 deletions

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 3826a3dbc7b0..c6ec8ede4fa0 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -87,17 +87,17 @@ DBG_NAMEEX( OutputDevice )
 // - externals -
 // -------------
 
-extern ULONG nVCLRLut[ 6 ];
-extern ULONG nVCLGLut[ 6 ];
-extern ULONG nVCLBLut[ 6 ];
-extern ULONG nVCLDitherLut[ 256 ];
-extern ULONG nVCLLut[ 256 ];
+extern sal_uIntPtr nVCLRLut[ 6 ];
+extern sal_uIntPtr nVCLGLut[ 6 ];
+extern sal_uIntPtr nVCLBLut[ 6 ];
+extern sal_uIntPtr nVCLDitherLut[ 256 ];
+extern sal_uIntPtr nVCLLut[ 256 ];
 
 // =======================================================================
 
-ULONG ImplAdjustTwoRect( TwoRect& rTwoRect, const Size& rSizePix )
+sal_uIntPtr ImplAdjustTwoRect( TwoRect& rTwoRect, const Size& rSizePix )
 {
-    ULONG nMirrFlags = 0;
+    sal_uIntPtr nMirrFlags = 0;
 
     if ( rTwoRect.mnDestWidth < 0 )
     {
@@ -389,7 +389,7 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
 
 void OutputDevice::CopyArea( const Point& rDestPt,
                              const Point& rSrcPt,  const Size& rSrcSize,
-                             USHORT nFlags )
+                             sal_uInt16 nFlags )
 {
     DBG_TRACE( "OutputDevice::CopyArea()" );
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
@@ -434,7 +434,7 @@ void OutputDevice::CopyArea( const Point& rDestPt,
                 ((Window*)this)->ImplMoveAllInvalidateRegions( aSrcRect,
                                                                aPosAry.mnDestX-aPosAry.mnSrcX,
                                                                aPosAry.mnDestY-aPosAry.mnSrcY,
-                                                               FALSE );
+                                                               sal_False );
 
                 mpGraphics->CopyArea( aPosAry.mnDestX, aPosAry.mnDestY,
                                       aPosAry.mnSrcX, aPosAry.mnSrcY,
@@ -464,10 +464,10 @@ void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, cons
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
     GDIMetaFile*    pOldMetaFile = mpMetaFile;
-    BOOL            bOldMap = mbMap;
+    sal_Bool            bOldMap = mbMap;
     RasterOp        eOldROP = GetRasterOp();
     mpMetaFile = NULL;
-    mbMap = FALSE;
+    mbMap = sal_False;
     SetRasterOp( ROP_OVERPAINT );
 
     if ( !IsDeviceOutputNecessary() )
@@ -497,7 +497,7 @@ void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, cons
     ImplDrawOutDevDirect( &rOutDev, &aPosAry );
 
     // Dafuer sorgen, das ClipRegion neu berechnet und gesetzt wird
-    mbInitClipRegion = TRUE;
+    mbInitClipRegion = sal_True;
 
     SetRasterOp( eOldROP );
     mbMap = bOldMap;
@@ -511,8 +511,8 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
-    BOOL bOldMap = mbMap;
-    mbMap = FALSE;
+    sal_Bool bOldMap = mbMap;
+    mbMap = sal_False;
     rDev.DrawOutDev( rDevPt, rDevSize, rPt, rDevSize, *this );
     mbMap = bOldMap;
 }
@@ -578,7 +578,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
 
 void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
                                    const Point& rSrcPtPixel, const Size& rSrcSizePixel,
-                                   const Bitmap& rBitmap, const ULONG nAction )
+                                   const Bitmap& rBitmap, const sal_uIntPtr nAction )
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
@@ -596,7 +596,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
     {
         if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP ) )
         {
-            BYTE cCmpVal;
+            sal_uInt8 cCmpVal;
 
             if ( mnDrawMode & DRAWMODE_BLACKBITMAP )
                 cCmpVal = ( mnDrawMode & DRAWMODE_GHOSTEDBITMAP ) ? 0x80 : 0;
@@ -655,7 +655,7 @@ void OutputDevice::ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize,
         aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() );
         aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() );
 
-        const ULONG nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmp.GetSizePixel() );
+        const sal_uIntPtr nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmp.GetSizePixel() );
 
         if ( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
         {
@@ -789,7 +789,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
 
 void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
                                      const Point& rSrcPtPixel, const Size& rSrcSizePixel,
-                                     const BitmapEx& rBitmapEx, const ULONG nAction )
+                                     const BitmapEx& rBitmapEx, const sal_uIntPtr nAction )
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
@@ -808,7 +808,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
         if ( mnDrawMode & ( DRAWMODE_BLACKBITMAP | DRAWMODE_WHITEBITMAP ) )
         {
             Bitmap  aColorBmp( aBmpEx.GetSizePixel(), ( mnDrawMode & DRAWMODE_GHOSTEDBITMAP ) ? 4 : 1 );
-            BYTE    cCmpVal;
+            sal_uInt8   cCmpVal;
 
             if ( mnDrawMode & DRAWMODE_BLACKBITMAP )
                 cCmpVal = ( mnDrawMode & DRAWMODE_GHOSTEDBITMAP ) ? 0x80 : 0;
@@ -902,7 +902,7 @@ void OutputDevice::ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize
         aPosAry.mnDestWidth = ImplLogicWidthToDevicePixel( rDestSize.Width() );
         aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() );
 
-        const ULONG nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmpEx.GetSizePixel() );
+        const sal_uIntPtr nMirrFlags = ImplAdjustTwoRect( aPosAry, aBmpEx.GetSizePixel() );
 
         if( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
         {
@@ -1096,7 +1096,7 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
 void OutputDevice::ImplDrawMask( const Point& rDestPt, const Size& rDestSize,
                                  const Point& rSrcPtPixel, const Size& rSrcSizePixel,
                                  const Bitmap& rBitmap, const Color& rMaskColor,
-                                 const ULONG nAction )
+                                 const sal_uIntPtr nAction )
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
@@ -1150,7 +1150,7 @@ void OutputDevice::ImplDrawMask( const Point& rDestPt, const Size& rDestSize,
         aPosAry.mnDestHeight = ImplLogicHeightToDevicePixel( rDestSize.Height() );
 
         // spiegeln via Koordinaten wollen wir nicht
-        const ULONG nMirrFlags = ImplAdjustTwoRect( aPosAry, pImpBmp->ImplGetSize() );
+        const sal_uIntPtr nMirrFlags = ImplAdjustTwoRect( aPosAry, pImpBmp->ImplGetSize() );
 
         // check if output is necessary
         if( aPosAry.mnSrcWidth && aPosAry.mnSrcHeight && aPosAry.mnDestWidth && aPosAry.mnDestHeight )
@@ -1173,7 +1173,7 @@ void OutputDevice::ImplDrawMask( const Point& rDestPt, const Size& rDestSize,
 
 // ------------------------------------------------------------------
 
-void OutputDevice::DrawImage( const Point& rPos, const Image& rImage, USHORT nStyle )
+void OutputDevice::DrawImage( const Point& rPos, const Image& rImage, sal_uInt16 nStyle )
 {
     DBG_ASSERT( GetOutDevType() != OUTDEV_PRINTER, "DrawImage(): Images can't be drawn on any mprinter" );
 
@@ -1210,7 +1210,7 @@ void OutputDevice::DrawImage( const Point& rPos, const Image& rImage, USHORT nSt
 // ------------------------------------------------------------------
 
 void OutputDevice::DrawImage( const Point& rPos, const Size& rSize,
-                              const Image& rImage, USHORT nStyle )
+                              const Image& rImage, sal_uInt16 nStyle )
 {
     DBG_ASSERT( GetOutDevType() != OUTDEV_PRINTER, "DrawImage(): Images can't be drawn on any mprinter" );
 
@@ -1261,14 +1261,14 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
         if ( nWidth && nHeight )
         {
             Rectangle   aRect( Point( nX, nY ), Size( nWidth, nHeight ) );
-            BOOL        bClipped = FALSE;
+            sal_Bool        bClipped = sal_False;
 
             // X-Koordinate ausserhalb des Bereichs?
             if ( nX < mnOutOffX )
             {
                 nWidth -= ( mnOutOffX - nX );
                 nX = mnOutOffX;
-                bClipped = TRUE;
+                bClipped = sal_True;
             }
 
             // Y-Koordinate ausserhalb des Bereichs?
@@ -1276,21 +1276,21 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
             {
                 nHeight -= ( mnOutOffY - nY );
                 nY = mnOutOffY;
-                bClipped = TRUE;
+                bClipped = sal_True;
             }
 
             // Breite ausserhalb des Bereichs?
             if ( (nWidth + nX) > (mnOutWidth + mnOutOffX) )
             {
                 nWidth  = mnOutOffX + mnOutWidth - nX;
-                bClipped = TRUE;
+                bClipped = sal_True;
             }
 
             // Hoehe ausserhalb des Bereichs?
             if ( (nHeight + nY) > (mnOutHeight + mnOutOffY) )
             {
                 nHeight = mnOutOffY + mnOutHeight - nY;
-                bClipped = TRUE;
+                bClipped = sal_True;
             }
 
             if ( bClipped )
@@ -1322,10 +1322,10 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
                         aBmp = aVDev.GetBitmap( Point(), aVDev.GetOutputSizePixel() );
                      }
                      else
-                        bClipped = FALSE;
+                        bClipped = sal_False;
                 }
                 else
-                    bClipped = FALSE;
+                    bClipped = sal_False;
             }
 
             if ( !bClipped )
@@ -1373,8 +1373,8 @@ void OutputDevice::ImplGetFrameBitmap( const Point& rDestPt, const Size& rSize,
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
-    BOOL bOldMap = mbMap;
-    ((OutputDevice*)this)->mbMap = FALSE;
+    sal_Bool bOldMap = mbMap;
+    ((OutputDevice*)this)->mbMap = sal_False;
     rBitmap = GetBitmap( rDestPt, rSize );
     ((OutputDevice*)this)->mbMap = bOldMap;
 }
@@ -1412,7 +1412,7 @@ Color* OutputDevice::GetPixel( const Polygon& rPts ) const
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
 
     Color*          pColors = NULL;
-    const USHORT    nSize = rPts.GetSize();
+    const sal_uInt16    nSize = rPts.GetSize();
 
     if( nSize )
     {
@@ -1425,7 +1425,7 @@ Color* OutputDevice::GetPixel( const Polygon& rPts ) const
             {
                 pColors = new Color[ nSize ];
 
-                for( USHORT i = 0; i < nSize; i++ )
+                for( sal_uInt16 i = 0; i < nSize; i++ )
                 {
                     Color&          rCol = pColors[ i ];
                     const Point&    rPt = rPts[ i ];
@@ -1504,7 +1504,7 @@ void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor )
             }
             else if( mnDrawMode & DRAWMODE_GRAYLINE )
             {
-                const UINT8 cLum = aColor.GetLuminance();
+                const sal_uInt8 cLum = aColor.GetLuminance();
                 aColor = Color( cLum, cLum, cLum );
             }
             else if( mnDrawMode & DRAWMODE_SETTINGSLINE )
@@ -1559,12 +1559,12 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color* pColors )
         DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
         DBG_ASSERT( pColors, "OutputDevice::DrawPixel: No color array specified" );
 
-        const USHORT nSize = rPts.GetSize();
+        const sal_uInt16 nSize = rPts.GetSize();
 
         if ( nSize )
         {
             if ( mpMetaFile )
-                for ( USHORT i = 0; i < nSize; i++ )
+                for ( sal_uInt16 i = 0; i < nSize; i++ )
                     mpMetaFile->AddAction( new MetaPixelAction( rPts[ i ], pColors[ i ] ) );
 
             if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() )
@@ -1579,7 +1579,7 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color* pColors )
                 if ( mbOutputClipped )
                     return;
 
-                for ( USHORT i = 0; i < nSize; i++ )
+                for ( sal_uInt16 i = 0; i < nSize; i++ )
                 {
                     const Point aPt( ImplLogicToDevicePixel( rPts[ i ] ) );
                     mpGraphics->DrawPixel( aPt.X(), aPt.Y(), ImplColorToSal( pColors[ i ] ), this );
@@ -1598,10 +1598,10 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color& rColor )
 {
     if( rColor != COL_TRANSPARENT && ! ImplIsRecordLayout() )
     {
-        const USHORT    nSize = rPts.GetSize();
+        const sal_uInt16    nSize = rPts.GetSize();
         Color*          pColArray = new Color[ nSize ];
 
-        for( USHORT i = 0; i < nSize; i++ )
+        for( sal_uInt16 i = 0; i < nSize; i++ )
             pColArray[ i ] = rColor;
 
         DrawPixel( rPts, pColArray );
@@ -1626,15 +1626,15 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
                                          const long*         pMapY )
 {
     BitmapColor aDstCol,aSrcCol;
-    BYTE        nSrcAlpha, nDstAlpha;
+    sal_uInt8        nSrcAlpha, nDstAlpha;
     Bitmap      res;
     int         nX, nOutX, nY, nOutY;
 
     OSL_ENSURE(mpAlphaVDev,
                "ImplBlendWithAlpha(): call me only with valid alpha VDev!" );
 
-    BOOL bOldMapMode( mpAlphaVDev->IsMapModeEnabled() );
-    mpAlphaVDev->EnableMapMode(FALSE);
+    sal_Bool bOldMapMode( mpAlphaVDev->IsMapModeEnabled() );
+    mpAlphaVDev->EnableMapMode(sal_False);
 
     Bitmap aAlphaBitmap( mpAlphaVDev->GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
     BitmapWriteAccess*  pAlphaW = aAlphaBitmap.AcquireWriteAccess();
@@ -1656,7 +1656,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
                 for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ )
                 {
                     const long  nMapX = pMapX[ nX ];
-                    const ULONG nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ];
+                    const sal_uIntPtr nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ];
 
                     aSrcCol = pP->GetColor( nMapY, nMapX );
                     aDstCol = pB->GetColor( nY, nX );
@@ -1666,20 +1666,20 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
                     if( nSrcAlpha + nDstAlpha == 0 )
                     {
                         // #i70653# zero alpha -> zero color values
-                        aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ 0 ] + nD ) >> 16UL ] +
+                        aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ 0 ] + nD ) >> 16UL ] +
                                                   nVCLGLut[ ( nVCLLut[ 0 ] + nD ) >> 16UL ] +
                                                   nVCLBLut[ ( nVCLLut[ 0 ] + nD ) >> 16UL ] ) );
                     }
                     else
                     {
-                        aDstCol.SetRed( (BYTE)(((int)(aSrcCol.GetRed())*nSrcAlpha + (int)(aDstCol.GetRed())*nDstAlpha) /
+                        aDstCol.SetRed( (sal_uInt8)(((int)(aSrcCol.GetRed())*nSrcAlpha + (int)(aDstCol.GetRed())*nDstAlpha) /
                                                (nSrcAlpha+nDstAlpha)) );
-                        aDstCol.SetGreen( (BYTE)(((int)(aSrcCol.GetGreen())*nSrcAlpha + (int)(aDstCol.GetGreen())*nDstAlpha) /
+                        aDstCol.SetGreen( (sal_uInt8)(((int)(aSrcCol.GetGreen())*nSrcAlpha + (int)(aDstCol.GetGreen())*nDstAlpha) /
                                                  (nSrcAlpha+nDstAlpha)) );
-                        aDstCol.SetBlue( (BYTE)(((int)(aSrcCol.GetBlue())*nSrcAlpha + (int)(aDstCol.GetBlue())*nDstAlpha) /
+                        aDstCol.SetBlue( (sal_uInt8)(((int)(aSrcCol.GetBlue())*nSrcAlpha + (int)(aDstCol.GetBlue())*nDstAlpha) /
                                                 (nSrcAlpha+nDstAlpha)) );
 
-                        aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] +
+                        aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] +
                                                   nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16UL ] +
                                                   nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16UL ] ) );
                     }
@@ -1689,9 +1689,9 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
                     // the inverse alpha space (with 255 meaning
                     // opaque), otherwise, transitivity is not
                     // achieved.
-                    nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (BYTE)nDstAlpha, nSrcAlpha );
+                    nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (sal_uInt8)nDstAlpha, nSrcAlpha );
 
-                    aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ nSrcAlpha ] + nD ) >> 16UL ] +
+                    aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ nSrcAlpha ] + nD ) >> 16UL ] +
                                               nVCLGLut[ ( nVCLLut[ nSrcAlpha ] + nD ) >> 16UL ] +
                                               nVCLBLut[ ( nVCLLut[ nSrcAlpha ] + nD ) >> 16UL ] ) );
                     pAlphaW->SetPixel( nY, nX, aIndex );
@@ -1730,11 +1730,11 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
                     }
                     else
                     {
-                        aDstCol.SetRed( (BYTE)(((int)(aSrcCol.GetRed())*nSrcAlpha + (int)(aDstCol.GetRed())*nDstAlpha) /
+                        aDstCol.SetRed( (sal_uInt8)(((int)(aSrcCol.GetRed())*nSrcAlpha + (int)(aDstCol.GetRed())*nDstAlpha) /
                                                (nSrcAlpha+nDstAlpha)) );
-                        aDstCol.SetGreen( (BYTE)(((int)(aSrcCol.GetGreen())*nSrcAlpha + (int)(aDstCol.GetGreen())*nDstAlpha) /
+                        aDstCol.SetGreen( (sal_uInt8)(((int)(aSrcCol.GetGreen())*nSrcAlpha + (int)(aDstCol.GetGreen())*nDstAlpha) /
                                                  (nSrcAlpha+nDstAlpha)) );
-                        aDstCol.SetBlue( (BYTE)(((int)(aSrcCol.GetBlue())*nSrcAlpha + (int)(aDstCol.GetBlue())*nDstAlpha) /
+                        aDstCol.SetBlue( (sal_uInt8)(((int)(aSrcCol.GetBlue())*nSrcAlpha + (int)(aDstCol.GetBlue())*nDstAlpha) /
                                                 (nSrcAlpha+nDstAlpha)) );
                     }
 
@@ -1744,7 +1744,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap              aBmp,
                     // the inverse alpha space (with 255 meaning
                     // opaque), otherwise, transitivity is not
                     // achieved.
-                    nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (BYTE)nDstAlpha, nSrcAlpha );
+                    nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (sal_uInt8)nDstAlpha, nSrcAlpha );
 
                     pAlphaW->SetPixel( nY, nX, Color(nSrcAlpha, nSrcAlpha, nSrcAlpha) );
                 }
@@ -1799,11 +1799,11 @@ Bitmap OutputDevice::ImplBlend( Bitmap              aBmp,
                 for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ )
                 {
                     const long  nMapX = pMapX[ nX ];
-                    const ULONG nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ];
+                    const sal_uIntPtr nD = nVCLDitherLut[ nModY | ( nOutX & 0x0FL ) ];
 
                     aDstCol = pB->GetColor( nY, nX );
-                    aDstCol.Merge( pP->GetColor( nMapY, nMapX ), (BYTE) pA->GetPixel( nMapY, nMapX ) );
-                    aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] +
+                    aDstCol.Merge( pP->GetColor( nMapY, nMapX ), (sal_uInt8) pA->GetPixel( nMapY, nMapX ) );
+                    aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] +
                                               nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16UL ] +
                                               nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16UL ] ) );
                     pW->SetPixel( nY, nX, aIndex );
@@ -1938,7 +1938,7 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
     Point       aOutPt( LogicToPixel( rDestPt ) );
     Size        aOutSz( LogicToPixel( rDestSize ) );
     Rectangle   aDstRect( aNullPt, GetOutputSizePixel() );
-    const BOOL  bHMirr = aOutSz.Width() < 0, bVMirr = aOutSz.Height() < 0;
+    const sal_Bool  bHMirr = aOutSz.Width() < 0, bVMirr = aOutSz.Height() < 0;
 
     if( OUTDEV_WINDOW == meOutDevType )
     {
@@ -1987,7 +1987,7 @@ void OutputDevice::ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha,
                 &&  !aBmpRect.Intersection( Rectangle( rSrcPtPixel, rSrcSizePixel ) ).IsEmpty() )
         {
             GDIMetaFile*    pOldMetaFile = mpMetaFile; mpMetaFile = NULL;
-            const BOOL      bOldMap = mbMap; mbMap = FALSE;
+            const sal_Bool      bOldMap = mbMap; mbMap = sal_False;
             Bitmap          aBmp( GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) );
 
             // #109044# The generated bitmap need not necessarily be
@@ -2105,7 +2105,7 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
     if( !rBmp.IsEmpty() && aSrcRect.GetWidth() && aSrcRect.GetHeight() && aDestSz.Width() && aDestSz.Height() )
     {
         Bitmap  aPaint( rBmp ), aMask( rMask );
-        ULONG   nMirrFlags = 0UL;
+        sal_uIntPtr nMirrFlags = 0UL;
 
         if( aMask.GetBitCount() > 1 )
             aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
@@ -2152,9 +2152,9 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
         long            nX, nY, nWorkX, nWorkY, nWorkWidth, nWorkHeight;
         long*           pMapX = new long[ nSrcWidth + 1 ];
         long*           pMapY = new long[ nSrcHeight + 1 ];
-        const BOOL      bOldMap = mbMap;
+        const sal_Bool      bOldMap = mbMap;
 
-        mbMap = FALSE;
+        mbMap = sal_False;
 
         // create forward mapping tables
         for( nX = 0L; nX <= nSrcWidth; nX++ )
@@ -2166,7 +2166,7 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask
         // walk through all rectangles of mask
         Region          aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) );
         ImplRegionInfo  aInfo;
-        BOOL            bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight );
+        sal_Bool            bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight );
 
         while( bRgnRect )
         {
@@ -2203,7 +2203,7 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
     if( !rMask.IsEmpty() && aSrcRect.GetWidth() && aSrcRect.GetHeight() && aDestSz.Width() && aDestSz.Height() )
     {
         Bitmap  aMask( rMask );
-        ULONG   nMirrFlags = 0UL;
+        sal_uIntPtr nMirrFlags = 0UL;
 
         if( aMask.GetBitCount() > 1 )
             aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
@@ -2238,10 +2238,10 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
         long*           pMapX = new long[ nSrcWidth + 1 ];
         long*           pMapY = new long[ nSrcHeight + 1 ];
         GDIMetaFile*    pOldMetaFile = mpMetaFile;
-        const BOOL      bOldMap = mbMap;
+        const sal_Bool      bOldMap = mbMap;
 
         mpMetaFile = NULL;
-        mbMap = FALSE;
+        mbMap = sal_False;
         Push( PUSH_FILLCOLOR | PUSH_LINECOLOR );
         SetLineColor( rMaskColor );
         SetFillColor( rMaskColor );
@@ -2258,7 +2258,7 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor,
         // walk through all rectangles of mask
         Region          aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) );
         ImplRegionInfo  aInfo;
-        BOOL            bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight );
+        sal_Bool            bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight );
 
         while( bRgnRect )
         {