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

1 files changed, 15 insertions, 15 deletions

diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index c963ea32542e..94613d6264b2 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -37,7 +37,7 @@
 // - BitmapReadAccess -
 // --------------------
 
-BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, BOOL bModify ) :
+BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, sal_Bool bModify ) :
             mpBuffer        ( NULL ),
             mpScanBuf       ( NULL ),
             mFncGetPixel    ( NULL ),
@@ -54,7 +54,7 @@ BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap ) :
             mpScanBuf       ( NULL ),
             mFncGetPixel    ( NULL ),
             mFncSetPixel    ( NULL ),
-            mbModify        ( FALSE )
+            mbModify        ( sal_False )
 {
     ImplCreate( rBitmap );
 }
@@ -154,9 +154,9 @@ void BitmapReadAccess::ImplDestroy()
 
 // ------------------------------------------------------------------
 
-BOOL BitmapReadAccess::ImplSetAccessPointers( ULONG nFormat )
+sal_Bool BitmapReadAccess::ImplSetAccessPointers( sal_uIntPtr nFormat )
 {
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     switch( nFormat )
     {
@@ -178,7 +178,7 @@ BOOL BitmapReadAccess::ImplSetAccessPointers( ULONG nFormat )
         CASE_FORMAT( _32BIT_TC_MASK )
 
         default:
-            bRet = FALSE;
+            bRet = sal_False;
         break;
     }
 
@@ -196,7 +196,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
         sal_uInt32 nBits;
         bool       bMsb;
 
-        const ULONG nScanlineFormat = GetScanlineFormat();
+        const sal_uIntPtr nScanlineFormat = GetScanlineFormat();
         switch( nScanlineFormat )
         {
             case( BMP_FORMAT_1BIT_MSB_PAL ):
@@ -272,7 +272,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
                 else
                     nMask = static_cast<sal_uInt8>(0xffU >> (nLeftOverBits & 3UL));
 
-                BYTE* pLastBytes = (BYTE*)GetBuffer() + ( nScanSize - nBytes );
+                sal_uInt8* pLastBytes = (sal_uInt8*)GetBuffer() + ( nScanSize - nBytes );
                 for( sal_uInt32 i = 0; i < nHeight; i++, pLastBytes += nScanSize )
                 {
                     *pLastBytes &= nMask;
@@ -284,7 +284,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
         else if( nBits & 0x1f )
         {
             sal_uInt32  nMask = 0xffffffff << ( ( nScanSize << 3 ) - nBits );
-            BYTE*       pLast4Bytes = (BYTE*) GetBuffer() + ( nScanSize - 4 );
+            sal_uInt8*      pLast4Bytes = (sal_uInt8*) GetBuffer() + ( nScanSize - 4 );
 
 #ifdef OSL_LITENDIAN
             nMask = SWAPLONG( nMask );
@@ -304,7 +304,7 @@ void BitmapReadAccess::Flush()
 
 // ------------------------------------------------------------------
 
-void BitmapReadAccess::ReAccess( BOOL bModify )
+void BitmapReadAccess::ReAccess( sal_Bool bModify )
 {
     const ImpBitmap* pImpBmp = maBitmap.ImplGetImpBitmap();
 
@@ -320,7 +320,7 @@ void BitmapReadAccess::ReAccess( BOOL bModify )
 
 // ------------------------------------------------------------------
 
-USHORT BitmapReadAccess::GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const
+sal_uInt16 BitmapReadAccess::GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const
 {
     return( HasPalette() ? mpBuffer->maPalette.GetBestIndex( rBitmapColor ) : 0 );
 }
@@ -330,7 +330,7 @@ USHORT BitmapReadAccess::GetBestPaletteIndex( const BitmapColor& rBitmapColor )
 // ---------------------
 
 BitmapWriteAccess::BitmapWriteAccess( Bitmap& rBitmap ) :
-            BitmapReadAccess( rBitmap, TRUE ),
+            BitmapReadAccess( rBitmap, sal_True ),
             mpLineColor     ( NULL ),
             mpFillColor     ( NULL )
 {
@@ -366,16 +366,16 @@ void BitmapWriteAccess::CopyScanline( long nY, const BitmapReadAccess& rReadAcc
 // ------------------------------------------------------------------
 
 void BitmapWriteAccess::CopyScanline( long nY, ConstScanline aSrcScanline,
-                                      ULONG nSrcScanlineFormat, ULONG nSrcScanlineSize )
+                                      sal_uIntPtr nSrcScanlineFormat, sal_uIntPtr nSrcScanlineSize )
 {
-    const ULONG nFormat = BMP_SCANLINE_FORMAT( nSrcScanlineFormat );
+    const sal_uIntPtr nFormat = BMP_SCANLINE_FORMAT( nSrcScanlineFormat );
 
     DBG_ASSERT( ( nY >= 0 ) && ( nY < mpBuffer->mnHeight ), "y-coordinate in destination out of range!" );
     DBG_ASSERT( ( HasPalette() && nFormat <= BMP_FORMAT_8BIT_PAL ) ||
                 ( !HasPalette() && nFormat > BMP_FORMAT_8BIT_PAL ),
                 "No copying possible between palette and non palette scanlines!" );
 
-    const ULONG nCount = Min( GetScanlineSize(), nSrcScanlineSize );
+    const sal_uIntPtr nCount = Min( GetScanlineSize(), nSrcScanlineSize );
 
     if( nCount )
     {
@@ -437,7 +437,7 @@ void BitmapWriteAccess::CopyBuffer( const BitmapReadAccess& rReadAcc )
         ( GetScanlineSize() == rReadAcc.GetScanlineSize() ) )
     {
         const long  nHeight = Min( mpBuffer->mnHeight, rReadAcc.Height() );
-        const ULONG nCount = nHeight * mpBuffer->mnScanlineSize;
+        const sal_uIntPtr nCount = nHeight * mpBuffer->mnScanlineSize;
 
         memcpy( mpBuffer->mpBits, rReadAcc.GetBuffer(), nCount );
     }