Skip to content

C
core
Kaydet (Commit) 554e5442 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

svtools: sal_Bool->bool 

Change-Id: Ic9b4838c4d1b4d2d2ea4665811dd396bdbec31b7
üst 9604eb87
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
filter/source/msfilter/escherex.cxx
Dosyayı görüntüle @ 554e5442
...@@ -4124,7 +4124,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject ...@@ -4124,7 +4124,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
.WriteInt16( pGraphicAttr->GetChannelG() ) .WriteInt16( pGraphicAttr->GetChannelG() )
.WriteInt16( pGraphicAttr->GetChannelB() ) .WriteInt16( pGraphicAttr->GetChannelB() )
.WriteDouble( pGraphicAttr->GetGamma() ); .WriteDouble( pGraphicAttr->GetGamma() );
aSt.WriteUChar( (sal_Bool)( pGraphicAttr->IsInvert() == sal_True ) ) aSt.WriteUChar( pGraphicAttr->IsInvert() )
.WriteUChar( pGraphicAttr->GetTransparency() ); .WriteUChar( pGraphicAttr->GetTransparency() );
mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() ); mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() );
} }
......
include/svtools/genericunodialog.hxx
Dosyayı görüntüle @ 554e5442
...@@ -74,9 +74,9 @@ namespace svt ...@@ -74,9 +74,9 @@ namespace svt
protected: protected:
Dialog* m_pDialog; /// the dialog to execute Dialog* m_pDialog; /// the dialog to execute
sal_Bool m_bExecuting : 1; /// we're currently executing the dialog bool m_bExecuting : 1; /// we're currently executing the dialog
sal_Bool m_bCanceled : 1; /// endDialog was called while we were executing bool m_bCanceled : 1; /// endDialog was called while we were executing
sal_Bool m_bTitleAmbiguous : 1; /// m_sTitle has not been set yet bool m_bTitleAmbiguous : 1; /// m_sTitle has not been set yet
bool m_bInitialized : 1; /// has "initialize" been called? bool m_bInitialized : 1; /// has "initialize" been called?
bool m_bNeedInitialization : 1; /// do we need to be initialized before any other API call is allowed? bool m_bNeedInitialization : 1; /// do we need to be initialized before any other API call is allowed?
......
include/svtools/grfmgr.hxx
Dosyayı görüntüle @ 554e5442
This diff is collapsed.
svtools/source/graphic/grfattr.cxx
Dosyayı görüntüle @ 554e5442
...@@ -38,7 +38,7 @@ GraphicAttr::GraphicAttr() : ...@@ -38,7 +38,7 @@ GraphicAttr::GraphicAttr() :
mnRPercent ( 0 ), mnRPercent ( 0 ),
mnGPercent ( 0 ), mnGPercent ( 0 ),
mnBPercent ( 0 ), mnBPercent ( 0 ),
mbInvert ( sal_False ), mbInvert ( false ),
mcTransparency ( 0 ), mcTransparency ( 0 ),
meDrawMode ( GRAPHICDRAWMODE_STANDARD ) meDrawMode ( GRAPHICDRAWMODE_STANDARD )
{ {
...@@ -52,7 +52,7 @@ GraphicAttr::~GraphicAttr() ...@@ -52,7 +52,7 @@ GraphicAttr::~GraphicAttr()
sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
{ {
return( ( mfGamma == rAttr.mfGamma ) && return( ( mfGamma == rAttr.mfGamma ) &&
( mnMirrFlags == rAttr.mnMirrFlags ) && ( mnMirrFlags == rAttr.mnMirrFlags ) &&
...@@ -81,7 +81,7 @@ SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ) ...@@ -81,7 +81,7 @@ SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr )
rIStm.ReadUInt32( nTmp32 ).ReadUInt32( nTmp32 ).ReadDouble( rAttr.mfGamma ).ReadUInt32( rAttr.mnMirrFlags ).ReadUInt16( rAttr.mnRotate10 ); rIStm.ReadUInt32( nTmp32 ).ReadUInt32( nTmp32 ).ReadDouble( rAttr.mfGamma ).ReadUInt32( rAttr.mnMirrFlags ).ReadUInt16( rAttr.mnRotate10 );
rIStm.ReadInt16( rAttr.mnContPercent ).ReadInt16( rAttr.mnLumPercent ).ReadInt16( rAttr.mnRPercent ).ReadInt16( rAttr.mnGPercent ).ReadInt16( rAttr.mnBPercent ); rIStm.ReadInt16( rAttr.mnContPercent ).ReadInt16( rAttr.mnLumPercent ).ReadInt16( rAttr.mnRPercent ).ReadInt16( rAttr.mnGPercent ).ReadInt16( rAttr.mnBPercent );
rIStm.ReadUChar( rAttr.mbInvert ).ReadUChar( rAttr.mcTransparency ).ReadUInt16( nTmp16 ); rIStm.ReadCharAsBool( rAttr.mbInvert ).ReadUChar( rAttr.mcTransparency ).ReadUInt16( nTmp16 );
rAttr.meDrawMode = (GraphicDrawMode) nTmp16; rAttr.meDrawMode = (GraphicDrawMode) nTmp16;
if( aCompat.GetVersion() >= 2 ) if( aCompat.GetVersion() >= 2 )
......
svtools/source/graphic/grfmgr2.cxx
Dosyayı görüntüle @ 554e5442
...@@ -64,7 +64,7 @@ void GraphicManager::SetMaxCacheSize( sal_uLong nNewCacheSize ) ...@@ -64,7 +64,7 @@ void GraphicManager::SetMaxCacheSize( sal_uLong nNewCacheSize )
mpCache->SetMaxDisplayCacheSize( nNewCacheSize ); mpCache->SetMaxDisplayCacheSize( nNewCacheSize );
} }
void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached ) void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, bool bDestroyGreaterCached )
{ {
mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize, bDestroyGreaterCached ); mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize, bDestroyGreaterCached );
} }
...@@ -79,22 +79,22 @@ void GraphicManager::ReleaseFromCache( const GraphicObject& /*rObj*/ ) ...@@ -79,22 +79,22 @@ void GraphicManager::ReleaseFromCache( const GraphicObject& /*rObj*/ )
// !!! // !!!
} }
sal_Bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt, bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt,
const Size& rSz, const GraphicObject& rObj, const Size& rSz, const GraphicObject& rObj,
const GraphicAttr& rAttr ) const const GraphicAttr& rAttr ) const
{ {
return mpCache->IsInDisplayCache( pOut, rPt, rSz, rObj, rAttr ); return mpCache->IsInDisplayCache( pOut, rPt, rSz, rObj, rAttr );
} }
sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
GraphicObject& rObj, const GraphicAttr& rAttr, GraphicObject& rObj, const GraphicAttr& rAttr,
const sal_uLong nFlags, sal_Bool& rCached ) const sal_uLong nFlags, bool& rCached )
{ {
Point aPt( rPt ); Point aPt( rPt );
Size aSz( rSz ); Size aSz( rSz );
sal_Bool bRet = sal_False; bool bRet = false;
rCached = sal_False; rCached = false;
if( ( rObj.GetType() == GRAPHIC_BITMAP ) || ( rObj.GetType() == GRAPHIC_GDIMETAFILE ) ) if( ( rObj.GetType() == GRAPHIC_BITMAP ) || ( rObj.GetType() == GRAPHIC_GDIMETAFILE ) )
{ {
...@@ -126,7 +126,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si ...@@ -126,7 +126,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si
aGraphic.Draw( pOut, aPt, aSz ); aGraphic.Draw( pOut, aPt, aSz );
} }
bRet = sal_True; bRet = true;
} }
if( !bRet ) if( !bRet )
...@@ -135,7 +135,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si ...@@ -135,7 +135,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si
if( !mpCache->DrawDisplayCacheObj( pOut, aPt, aSz, rObj, rAttr ) ) if( !mpCache->DrawDisplayCacheObj( pOut, aPt, aSz, rObj, rAttr ) )
bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, nFlags, rCached ); bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, nFlags, rCached );
else else
bRet = rCached = sal_True; bRet = rCached = true;
} }
} }
...@@ -171,7 +171,7 @@ OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const ...@@ -171,7 +171,7 @@ OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const
return mpCache->GetUniqueID( rObj ); return mpCache->GetUniqueID( rObj );
} }
sal_Bool GraphicManager::ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ) bool GraphicManager::ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute )
{ {
return( mpCache->FillSwappedGraphicObject( rObj, rSubstitute ) ); return( mpCache->FillSwappedGraphicObject( rObj, rSubstitute ) );
} }
...@@ -181,13 +181,13 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ) ...@@ -181,13 +181,13 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj )
mpCache->GraphicObjectWasSwappedIn( rObj ); mpCache->GraphicObjectWasSwappedIn( rObj );
} }
sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
const Size& rSz, GraphicObject& rObj, const Size& rSz, GraphicObject& rObj,
const GraphicAttr& rAttr, const GraphicAttr& rAttr,
const sal_uLong nFlags, sal_Bool& rCached ) const sal_uLong nFlags, bool& rCached )
{ {
const Graphic& rGraphic = rObj.GetGraphic(); const Graphic& rGraphic = rObj.GetGraphic();
sal_Bool bRet = sal_False; bool bRet = false;
if( rGraphic.IsSupportedGraphic() && !rGraphic.IsSwapOut() ) if( rGraphic.IsSupportedGraphic() && !rGraphic.IsSwapOut() )
{ {
...@@ -205,7 +205,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, ...@@ -205,7 +205,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &aDstBmpEx ) ) if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &aDstBmpEx ) )
{ {
rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx ); rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
bRet = sal_True; bRet = true;
} }
} }
...@@ -232,13 +232,13 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, ...@@ -232,13 +232,13 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) ) if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) )
{ {
rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx ); rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx );
bRet = sal_True; bRet = true;
} }
} }
else else
{ {
rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstMtf ); rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstMtf );
bRet = sal_True; bRet = true;
} }
} }
} }
...@@ -250,7 +250,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, ...@@ -250,7 +250,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
if( aGraphic.IsSupportedGraphic() ) if( aGraphic.IsSupportedGraphic() )
{ {
aGraphic.Draw( pOut, rPt, rSz ); aGraphic.Draw( pOut, rPt, rSz );
bRet = sal_True; bRet = true;
} }
} }
} }
...@@ -259,7 +259,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, ...@@ -259,7 +259,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt,
return bRet; return bRet;
} }
sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttributes, bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttributes,
sal_uInt16 nRot10, const Size& rUnrotatedSzPix, sal_uInt16 nRot10, const Size& rUnrotatedSzPix,
long nStartX, long nEndX, long nStartY, long nEndY, long nStartX, long nEndX, long nStartY, long nEndY,
BitmapEx& rOutBmpEx ) BitmapEx& rOutBmpEx )
...@@ -818,7 +818,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAt ...@@ -818,7 +818,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAt
return bRet; return bRet;
} }
sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice,
const Point& rPoint, const Size& rSize, const Point& rPoint, const Size& rSize,
const BitmapEx& rBitmapEx, const GraphicAttr& rAttributes, const BitmapEx& rBitmapEx, const GraphicAttr& rAttributes,
const sal_uLong /*nFlags*/, BitmapEx* pBmpEx ) const sal_uLong /*nFlags*/, BitmapEx* pBmpEx )
...@@ -1036,7 +1036,7 @@ static BitmapEx checkMetadataBitmap( const BitmapEx& rBmpEx, ...@@ -1036,7 +1036,7 @@ static BitmapEx checkMetadataBitmap( const BitmapEx& rBmpEx,
return aBmpEx; return aBmpEx;
} }
sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
const Point& rPt, const Size& rSz, const Point& rPt, const Size& rSz,
const GDIMetaFile& rMtf, const GraphicAttr& rAttr, const GDIMetaFile& rMtf, const GraphicAttr& rAttr,
const sal_uLong /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ) const sal_uLong /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx )
...@@ -1345,7 +1345,7 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, ...@@ -1345,7 +1345,7 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
rOutBmpEx = BitmapEx(); rOutBmpEx = BitmapEx();
} }
return sal_True; return true;
} }
void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ) void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags )
...@@ -1632,7 +1632,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, ...@@ -1632,7 +1632,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
// #105229# Switch off mapping (converting to logic and back to // #105229# Switch off mapping (converting to logic and back to
// pixel might cause roundoff errors) // pixel might cause roundoff errors)
sal_Bool bOldMap( rVDev.IsMapModeEnabled() ); bool bOldMap( rVDev.IsMapModeEnabled() );
rVDev.EnableMapMode( false ); rVDev.EnableMapMode( false );
bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY, bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY,
...@@ -1988,7 +1988,7 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, ...@@ -1988,7 +1988,7 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx,
const Size& rCropRightBottom, const Size& rCropRightBottom,
const Rectangle& rCropRect, const Rectangle& rCropRect,
const Size& rDstSize, const Size& rDstSize,
sal_Bool bEnlarge ) const bool bEnlarge ) const
{ {
// #107947# Extracted from svdograf.cxx // #107947# Extracted from svdograf.cxx
......
svtools/source/uno/genericunodialog.cxx
Dosyayı görüntüle @ 554e5442
...@@ -48,9 +48,9 @@ namespace svt ...@@ -48,9 +48,9 @@ namespace svt
OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext) OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext)
:OPropertyContainer(GetBroadcastHelper()) :OPropertyContainer(GetBroadcastHelper())
,m_pDialog(NULL) ,m_pDialog(NULL)
,m_bExecuting(sal_False) ,m_bExecuting(false)
,m_bCanceled(sal_False) ,m_bCanceled(false)
,m_bTitleAmbiguous(sal_True) ,m_bTitleAmbiguous(true)
,m_bInitialized( false ) ,m_bInitialized( false )
,m_bNeedInitialization( false ) ,m_bNeedInitialization( false )
,m_aContext(_rxContext) ,m_aContext(_rxContext)
...@@ -112,7 +112,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con ...@@ -112,7 +112,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
if (UNODIALOG_PROPERTY_ID_TITLE == nHandle) if (UNODIALOG_PROPERTY_ID_TITLE == nHandle)
{ {
// from now on m_sTitle is valid // from now on m_sTitle is valid
m_bTitleAmbiguous = sal_False; m_bTitleAmbiguous = false;
if (m_pDialog) if (m_pDialog)
m_pDialog->SetText(m_sTitle); m_pDialog->SetText(m_sTitle);
...@@ -212,8 +212,8 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e ...@@ -212,8 +212,8 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e
*this *this
); );
m_bCanceled = sal_False; m_bCanceled = false;
m_bExecuting = sal_True; m_bExecuting = true;
if ( !impl_ensureDialog_lck() ) if ( !impl_ensureDialog_lck() )
return 0; return 0;
...@@ -238,7 +238,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e ...@@ -238,7 +238,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e
// get the settings of the dialog // get the settings of the dialog
executedDialog( nReturn ); executedDialog( nReturn );
m_bExecuting = sal_False; m_bExecuting = false;
} }
// outta here // outta here
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment