diff options
author | Tomaž Vajngerl <quikee@gmail.com> | 2012-06-25 20:10:38 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2012-06-25 21:24:47 +0200 |
commit | 16e73f6d728d7fe40c4a87ee7e29caf649090407 (patch) | |
tree | 636b802f5c9de6b34293a0f7414471a68b473fe9 | |
parent | 6fadb99a0bf97a5e96f6702ab626fee5d13a3b2e (diff) |
Cleanup code comments and change Sal_bool to bool
Change-Id: Iebc86650365041939be0df339790e01391f72e89
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 8c2052367db4..33192b596595 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -57,8 +57,6 @@ GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize { } -// ----------------------------------------------------------------------------- - GraphicManager::~GraphicManager() { for( size_t i = 0, n = maObjList.size(); i < n; ++i ) @@ -67,36 +65,26 @@ GraphicManager::~GraphicManager() delete mpCache; } -// ----------------------------------------------------------------------------- - void GraphicManager::SetMaxCacheSize( sal_uLong nNewCacheSize ) { mpCache->SetMaxDisplayCacheSize( nNewCacheSize ); } -// ----------------------------------------------------------------------------- - void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached ) { mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize, bDestroyGreaterCached ); } -// ----------------------------------------------------------------------------- - void GraphicManager::SetCacheTimeout( sal_uLong nTimeoutSeconds ) { mpCache->SetCacheTimeout( nTimeoutSeconds ); } -// ----------------------------------------------------------------------------- - void GraphicManager::ReleaseFromCache( const GraphicObject& /*rObj*/ ) { // !!! } -// ----------------------------------------------------------------------------- - sal_Bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const @@ -104,8 +92,6 @@ sal_Bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt, return mpCache->IsInDisplayCache( pOut, rPt, rSz, rObj, rAttr ); } -// ----------------------------------------------------------------------------- - sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, const sal_uLong nFlags, sal_Bool& rCached ) @@ -162,8 +148,6 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si return bRet; } -// ----------------------------------------------------------------------------- - void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, const rtl::OString* pID, const GraphicObject* pCopyObj ) { @@ -171,8 +155,6 @@ void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubst mpCache->AddGraphicObject( rObj, rSubstitute, pID, pCopyObj ); } -// ----------------------------------------------------------------------------- - void GraphicManager::ImplUnregisterObj( const GraphicObject& rObj ) { mpCache->ReleaseGraphicObject( rObj ); @@ -185,36 +167,26 @@ void GraphicManager::ImplUnregisterObj( const GraphicObject& rObj ) } } -// ----------------------------------------------------------------------------- - void GraphicManager::ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ) { mpCache->GraphicObjectWasSwappedOut( rObj ); } -// ----------------------------------------------------------------------------- - rtl::OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const { return mpCache->GetUniqueID( rObj ); } -// ----------------------------------------------------------------------------- - sal_Bool GraphicManager::ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ) { return( mpCache->FillSwappedGraphicObject( rObj, rSubstitute ) ); } -// ----------------------------------------------------------------------------- - void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ) { mpCache->GraphicObjectWasSwappedIn( rObj ); } -// ----------------------------------------------------------------------------- - sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, @@ -520,8 +492,6 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, return bRet; } -// ----------------------------------------------------------------------------- - // This function checks whether the bitmap is usable for skipping // mtf rendering by using just this one bitmap (i.e. in case the metafile // contains just this one pixmap that covers the entire metafile area). @@ -895,8 +865,6 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, return sal_True; } -// ----------------------------------------------------------------------------- - sal_Bool GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY, long nStartX, long nEndX, long nStartY, long nEndY, @@ -1730,8 +1698,6 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal } } -// ----------------------------------------------------------------------------- - void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ) { GraphicAttr aAttr( rAttr ); @@ -1783,8 +1749,6 @@ void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sa } } -// ----------------------------------------------------------------------------- - void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ) { GraphicAttr aAttr( rAttr ); @@ -1836,8 +1800,6 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr } } -// ----------------------------------------------------------------------------- - void GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr ) { @@ -1865,8 +1827,6 @@ void GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& pOut->Pop(); } -// ----------------------------------------------------------------------------- - struct ImplTileInfo { ImplTileInfo() : aTileTopLeft(), aNextTileTopLeft(), aTileSizePixel(), nTilesEmptyX(0), nTilesEmptyY(0) {} @@ -1930,8 +1890,6 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, return bRet; } -// ----------------------------------------------------------------------------- - // define for debug drawings //#define DBG_TEST @@ -2115,8 +2073,6 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent return true; } -// ----------------------------------------------------------------------------- - bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel, const Size& rOffset, const GraphicAttr* pAttr, sal_uLong nFlags, int nTileCacheSize1D ) { @@ -2225,8 +2181,6 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c return bRet; } -// ----------------------------------------------------------------------------- - bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, sal_uLong nFlags ) @@ -2237,11 +2191,11 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, // #107607# Use logical coordinates for metafile playing, too bool bDrawInPixel( rOut.GetConnectMetaFile() == NULL && GRAPHIC_BITMAP == GetType() ); - sal_Bool bRet( sal_False ); + bool bRet = false; // #105229# Switch off mapping (converting to logic and back to // pixel might cause roundoff errors) - sal_Bool bOldMap( rOut.IsMapModeEnabled() ); + bool bOldMap( rOut.IsMapModeEnabled() ); if( bDrawInPixel ) rOut.EnableMapMode( sal_False ); @@ -2275,8 +2229,6 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, return bRet; } -// ----------------------------------------------------------------------------- - void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, const GraphicAttr& rAttr, const Size& rCropLeftTop, |