[Libreoffice-commits] core.git: include/vcl vcl/source
Takeshi Abe
tabe at fixedpoint.jp
Sun Jun 9 04:23:44 PDT 2013
include/vcl/animate.hxx | 8 ++++----
vcl/source/fontsubset/sft.cxx | 10 +++++-----
vcl/source/gdi/animate.cxx | 20 ++++++++++----------
vcl/source/gdi/bitmap.cxx | 24 ++++++++++++------------
vcl/source/gdi/bitmap2.cxx | 22 +++++++++++-----------
vcl/source/gdi/bitmap3.cxx | 12 ++++++------
6 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit 6571193609f4fb4e5ac714b55787d172a86983fe
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Jun 9 20:20:50 2013 +0900
sal_Bool to bool
Change-Id: Ib712c9ebf8d8e6aae5e04fec19be629d3393f5d5
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index dd374e8..7083aa9 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -68,7 +68,7 @@ struct VCL_DLLPUBLIC AnimationBitmap
bUserInput ( sal_False )
{}
- sal_Bool operator==( const AnimationBitmap& rAnimBmp ) const
+ bool operator==( const AnimationBitmap& rAnimBmp ) const
{
return( rAnimBmp.aBmpEx == aBmpEx &&
rAnimBmp.aPosPix == aPosPix &&
@@ -78,7 +78,7 @@ struct VCL_DLLPUBLIC AnimationBitmap
rAnimBmp.bUserInput == bUserInput );
}
- sal_Bool operator!=( const AnimationBitmap& rAnimBmp ) const
+ bool operator!=( const AnimationBitmap& rAnimBmp ) const
{ return !( *this == rAnimBmp ); }
sal_Bool IsEqual( const AnimationBitmap& rAnimBmp ) const
@@ -159,8 +159,8 @@ public:
~Animation();
Animation& operator=( const Animation& rAnimation );
- sal_Bool operator==( const Animation& rAnimation ) const;
- sal_Bool operator!=( const Animation& rAnimation ) const
+ bool operator==( const Animation& rAnimation ) const;
+ bool operator!=( const Animation& rAnimation ) const
{ return !(*this==rAnimation); }
void Clear();
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 07d469b..548b2d3 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1033,7 +1033,7 @@ static void GetNames(TrueTypeFont *t)
sal_uInt16 n = GetUInt16(table, 2, 1);
int i, r;
- sal_Bool bPSNameOK = sal_True;
+ bool bPSNameOK = true;
/* #129743# simple sanity check for name table entry count */
if( nTableSize <= n * 12 + 6 )
@@ -1115,16 +1115,16 @@ static void GetNames(TrueTypeFont *t)
/* check psname */
for( i = 0; t->psname[i] != 0 && bPSNameOK; i++ )
if( t->psname[ i ] < 33 || (t->psname[ i ] & 0x80) )
- bPSNameOK = sal_False;
- if( bPSNameOK == sal_False )
+ bPSNameOK = false;
+ if( !bPSNameOK )
{
- sal_Bool bReplace = sal_True;
+ bool bReplace = true;
/* check if family is a suitable replacement */
if( t->ufamily && t->family )
{
for( i = 0; t->ufamily[ i ] != 0 && bReplace; i++ )
if( t->ufamily[ i ] < 33 || t->ufamily[ i ] > 127 )
- bReplace = sal_False;
+ bReplace = false;
if( bReplace )
{
free( t->psname );
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index ecac87e..e73d19f 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -126,10 +126,10 @@ Animation& Animation::operator=( const Animation& rAnimation )
return *this;
}
-sal_Bool Animation::operator==( const Animation& rAnimation ) const
+bool Animation::operator==( const Animation& rAnimation ) const
{
const size_t nCount = maList.size();
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( rAnimation.maList.size() == nCount
&& rAnimation.maBitmapEx == maBitmapEx
@@ -137,13 +137,13 @@ sal_Bool Animation::operator==( const Animation& rAnimation ) const
&& rAnimation.meCycleMode == meCycleMode
)
{
- bRet = sal_True;
+ bRet = true;
for( size_t n = 0; n < nCount; n++ )
{
if( ( *maList[ n ] ) != ( *rAnimation.maList[ n ] ) )
{
- bRet = sal_False;
+ bRet = false;
break;
}
}
@@ -366,7 +366,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl)
if( nAnimCount )
{
ImplAnimView* pView;
- sal_Bool bGlobalPause = sal_True;
+ bool bGlobalPause = true;
if( maNotifyLink.IsSet() )
{
@@ -413,7 +413,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl)
else
{
if( !pView->ImplIsPause() )
- bGlobalPause = sal_False;
+ bGlobalPause = false;
pView->ImplSetMarked( sal_False );
i++;
@@ -421,7 +421,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl)
}
}
else
- bGlobalPause = sal_False;
+ bGlobalPause = false;
if( maViewList.empty() )
Stop();
@@ -746,7 +746,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
sal_uLong nStmPos = rIStm.Tell();
sal_uInt32 nAnimMagic1, nAnimMagic2;
sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt();
- sal_Bool bReadAnimations = sal_False;
+ bool bReadAnimations = false;
rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
nStmPos = rIStm.Tell();
@@ -757,7 +757,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
// If the BitmapEx at the beginning have already been read (by Graphic)
// we can start reading the AnimationBitmaps right away
if( ( nAnimMagic1 == 0x5344414e ) && ( nAnimMagic2 == 0x494d4931 ) && !rIStm.GetError() )
- bReadAnimations = sal_True;
+ bReadAnimations = true;
// Else, we try reading the Bitmap(-Ex)
else
{
@@ -767,7 +767,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation )
rIStm >> nAnimMagic1 >> nAnimMagic2;
if( ( nAnimMagic1 == 0x5344414e ) && ( nAnimMagic2 == 0x494d4931 ) && !rIStm.GetError() )
- bReadAnimations = sal_True;
+ bReadAnimations = true;
else
rIStm.Seek( nStmPos );
}
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 223dc64..0853cb1 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -449,7 +449,7 @@ sal_Bool Bitmap::Erase( const Color& rFillColor )
{
const sal_uLong nFormat = pWriteAcc->GetScanlineFormat();
sal_uInt8 cIndex = 0;
- sal_Bool bFast = sal_False;
+ bool bFast = false;
switch( nFormat )
{
@@ -458,7 +458,7 @@ sal_Bool Bitmap::Erase( const Color& rFillColor )
{
cIndex = (sal_uInt8) pWriteAcc->GetBestPaletteIndex( rFillColor );
cIndex = ( cIndex ? 255 : 0 );
- bFast = sal_True;
+ bFast = true;
}
break;
@@ -467,14 +467,14 @@ sal_Bool Bitmap::Erase( const Color& rFillColor )
{
cIndex = (sal_uInt8) pWriteAcc->GetBestPaletteIndex( rFillColor );
cIndex = cIndex | ( cIndex << 4 );
- bFast = sal_True;
+ bFast = true;
}
break;
case( BMP_FORMAT_8BIT_PAL ):
{
cIndex = (sal_uInt8) pWriteAcc->GetBestPaletteIndex( rFillColor );
- bFast = sal_True;
+ bFast = true;
}
break;
@@ -485,15 +485,15 @@ sal_Bool Bitmap::Erase( const Color& rFillColor )
( rFillColor.GetRed() == rFillColor.GetBlue() ) )
{
cIndex = rFillColor.GetRed();
- bFast = sal_True;
+ bFast = true;
}
else
- bFast = sal_False;
+ bFast = false;
}
break;
default:
- bFast = sal_False;
+ bFast = false;
break;
}
@@ -553,8 +553,8 @@ sal_Bool Bitmap::Invert()
sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags )
{
- sal_Bool bHorz = ( ( nMirrorFlags & BMP_MIRROR_HORZ ) == BMP_MIRROR_HORZ );
- sal_Bool bVert = ( ( nMirrorFlags & BMP_MIRROR_VERT ) == BMP_MIRROR_VERT );
+ bool bHorz = ( ( nMirrorFlags & BMP_MIRROR_HORZ ) == BMP_MIRROR_HORZ );
+ bool bVert = ( ( nMirrorFlags & BMP_MIRROR_VERT ) == BMP_MIRROR_VERT );
sal_Bool bRet = sal_False;
if( bHorz && !bVert )
@@ -880,19 +880,19 @@ sal_Bool Bitmap::CopyPixel( const Rectangle& rRectDst,
{
const long nSrcCount = pDstAcc->GetPaletteEntryCount();
const long nDstCount = 1 << nDstBitCount;
- sal_Bool bFound;
+ bool bFound;
for( long i = 0L; ( i < nSrcCount ) && ( nNextIndex < nSrcCount ); i++ )
{
const BitmapColor& rSrcCol = pSrcAcc->GetPaletteColor( (sal_uInt16) i );
- bFound = sal_False;
+ bFound = false;
for( long j = 0L; j < nDstCount; j++ )
{
if( rSrcCol == pDstAcc->GetPaletteColor( (sal_uInt16) j ) )
{
- bFound = sal_True;
+ bFound = true;
break;
}
}
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index 92078d2..2866ac4 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.cxx
@@ -414,9 +414,9 @@ sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, Bitma
sal_uInt32 nRMask = 0;
sal_uInt32 nGMask = 0;
sal_uInt32 nBMask = 0;
- sal_Bool bNative;
- sal_Bool bTCMask = ( rHeader.nBitCount == 16 ) || ( rHeader.nBitCount == 32 );
- sal_Bool bRLE = ( RLE_8 == rHeader.nCompression && rHeader.nBitCount == 8 ) ||
+ bool bNative;
+ bool bTCMask = ( rHeader.nBitCount == 16 ) || ( rHeader.nBitCount == 32 );
+ bool bRLE = ( RLE_8 == rHeader.nCompression && rHeader.nBitCount == 8 ) ||
( RLE_4 == rHeader.nCompression && rHeader.nBitCount == 4 );
// Is native format?
@@ -430,7 +430,7 @@ sal_Bool Bitmap::ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, Bitma
break;
default:
- bNative = sal_False;
+ bNative = false;
break;
}
// Read data
@@ -913,7 +913,7 @@ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
const sal_uInt16 nBitCount( sal::static_int_cast<sal_uInt16>(rAcc.GetBitCount()) );
const sal_uLong nAlignedWidth = AlignedWidth4Bytes( rAcc.Width() *
discretizeBitcount(nBitCount));
- sal_Bool bNative = sal_False;
+ bool bNative = false;
switch( rAcc.GetScanlineFormat() )
{
@@ -923,7 +923,7 @@ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
case( BMP_FORMAT_24BIT_TC_BGR ):
{
if( rAcc.IsBottomUp() && ( rAcc.GetScanlineSize() == nAlignedWidth ) )
- bNative = sal_True;
+ bNative = true;
}
break;
@@ -1056,7 +1056,7 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader,
sal_uLong nRunByte;
sal_uLong nX = 0UL;
sal_uInt8 cTmp;
- sal_Bool bEndDecoding = sal_False;
+ bool bEndDecoding = false;
do
{
@@ -1112,7 +1112,7 @@ void Bitmap::ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader,
nX = 0UL;
}
else if( nRunByte == 1 )
- bEndDecoding = sal_True;
+ bEndDecoding = true;
else
{
nX += *pRLE++;
@@ -1161,7 +1161,7 @@ sal_Bool Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool
sal_uInt8* pTmp;
sal_uInt8 cPix;
sal_uInt8 cLast;
- sal_Bool bFound;
+ bool bFound;
for ( long nY = nHeight - 1L; nY >= 0L; nY-- )
{
@@ -1190,14 +1190,14 @@ sal_Bool Bitmap::ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool
{
cLast = cPix;
nSaveIndex = nX - 1UL;
- bFound = sal_False;
+ bFound = false;
while( ( nX < nWidth ) && ( nCount < 256L )
&& ( cPix = rAcc.GetPixelIndex( nY, nX ) ) != cLast )
{
nX++; nCount++;
cLast = cPix;
- bFound = sal_True;
+ bFound = true;
}
if ( bFound )
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 5b56ae4..1ee4ce4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -480,7 +480,7 @@ sal_Bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys )
{
const BitmapPalette& rPal = GetGreyPalette( nGreys );
sal_uLong nShift = ( ( nGreys == 16 ) ? 4UL : 0UL );
- sal_Bool bPalDiffers = !pReadAcc->HasPalette() || ( rPal.GetEntryCount() != pReadAcc->GetPaletteEntryCount() );
+ bool bPalDiffers = !pReadAcc->HasPalette() || ( rPal.GetEntryCount() != pReadAcc->GetPaletteEntryCount() );
if( !bPalDiffers )
bPalDiffers = ( (BitmapPalette&) rPal != pReadAcc->GetPalette() );
@@ -685,7 +685,7 @@ sal_Bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor )
long nX, nY;
long nYTmp = 0L;
sal_uInt8 cIndex;
- sal_Bool bQ1 = sal_True;
+ bool bQ1 = true;
if( pExtColor )
{
@@ -740,7 +740,7 @@ sal_Bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor )
// Refill/copy row buffer
pQLine1 = pQLine2;
- pQLine2 = ( bQ1 = !bQ1 ) != sal_False ? pErrQuad2 : pErrQuad1;
+ pQLine2 = ( bQ1 = !bQ1 ) ? pErrQuad2 : pErrQuad1;
if( nYTmp < nHeight )
{
@@ -2723,7 +2723,7 @@ sal_Bool Bitmap::ImplDitherFloyd16()
ImpErrorQuad* pQLine2 = 0;
long nX, nY;
long nYTmp = 0L;
- sal_Bool bQ1 = sal_True;
+ bool bQ1 = true;
for( nY = 0L; nY < std::min( nHeight, 2L ); nY++, nYTmp++ )
for( nX = 0L, pQLine2 = !nY ? pErrQuad1 : pErrQuad2; nX < nWidth; nX++ )
@@ -2761,7 +2761,7 @@ sal_Bool Bitmap::ImplDitherFloyd16()
// Refill/copy row buffer
pQLine1 = pQLine2;
- pQLine2 = ( bQ1 = !bQ1 ) != sal_False ? pErrQuad2 : pErrQuad1;
+ pQLine2 = ( bQ1 = !bQ1 ) ? pErrQuad2 : pErrQuad1;
if( nYTmp < nHeight )
for( nX = 0L; nX < nWidth; nX++ )
@@ -3313,7 +3313,7 @@ sal_Bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent,
// calculate gamma value
fGamma = ( fGamma <= 0.0 || fGamma > 10.0 ) ? 1.0 : ( 1.0 / fGamma );
- const sal_Bool bGamma = ( fGamma != 1.0 );
+ const bool bGamma = ( fGamma != 1.0 );
// create mapping table
for( nX = 0L; nX < 256L; nX++ )
More information about the Libreoffice-commits
mailing list