diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
| commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
| tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/source/gdi/impbmp.cxx | |
| parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'vcl/source/gdi/impbmp.cxx')
| -rw-r--r-- | vcl/source/gdi/impbmp.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 244e688601a5..f8d71112d3a1 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -64,7 +64,7 @@ void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap ) // ----------------------------------------------------------------------- -BOOL ImpBitmap::ImplCreate( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal ) +sal_Bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { maSourceSize = rSize; return mpSalBitmap->Create( rSize, nBitCount, rPal ); @@ -72,7 +72,7 @@ BOOL ImpBitmap::ImplCreate( const Size& rSize, USHORT nBitCount, const BitmapPal // ----------------------------------------------------------------------- -BOOL ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap ) +sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap ) { maSourceSize = rImpBitmap.maSourceSize; mnChecksum = rImpBitmap.mnChecksum; @@ -81,14 +81,14 @@ BOOL ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap ) // ----------------------------------------------------------------------- -BOOL ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ) +sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ) { return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, pGraphics ); } // ----------------------------------------------------------------------- -BOOL ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, USHORT nNewBitCount ) +sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ) { return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, nNewBitCount ); } @@ -109,22 +109,22 @@ Size ImpBitmap::ImplGetSize() const // ----------------------------------------------------------------------- -USHORT ImpBitmap::ImplGetBitCount() const +sal_uInt16 ImpBitmap::ImplGetBitCount() const { - USHORT nBitCount = mpSalBitmap->GetBitCount(); + sal_uInt16 nBitCount = mpSalBitmap->GetBitCount(); return( ( nBitCount <= 1 ) ? 1 : ( nBitCount <= 4 ) ? 4 : ( nBitCount <= 8 ) ? 8 : 24 ); } // ----------------------------------------------------------------------- -BitmapBuffer* ImpBitmap::ImplAcquireBuffer( BOOL bReadOnly ) +BitmapBuffer* ImpBitmap::ImplAcquireBuffer( sal_Bool bReadOnly ) { return mpSalBitmap->AcquireBuffer( bReadOnly ); } // ----------------------------------------------------------------------- -void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, BOOL bReadOnly ) +void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool bReadOnly ) { mpSalBitmap->ReleaseBuffer( pBuffer, bReadOnly ); |