diff options
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 | ||||
| -rw-r--r-- | include/svtools/genericunodialog.hxx | 6 | ||||
| -rw-r--r-- | include/svtools/grfmgr.hxx | 98 | ||||
| -rw-r--r-- | svtools/source/graphic/grfattr.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 90 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 44 | ||||
| -rw-r--r-- | svtools/source/uno/genericunodialog.cxx | 14 |
7 files changed, 130 insertions, 130 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 44d2c754e30d..d9889867b0d2 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -4124,7 +4124,7 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject .WriteInt16( pGraphicAttr->GetChannelG() ) .WriteInt16( pGraphicAttr->GetChannelB() ) .WriteDouble( pGraphicAttr->GetGamma() ); - aSt.WriteUChar( (sal_Bool)( pGraphicAttr->IsInvert() == sal_True ) ) + aSt.WriteUChar( pGraphicAttr->IsInvert() ) .WriteUChar( pGraphicAttr->GetTransparency() ); mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() ); } diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 373e2a4aa3c2..217de45144ad 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -74,9 +74,9 @@ namespace svt protected: Dialog* m_pDialog; /// the dialog to execute - sal_Bool m_bExecuting : 1; /// we're currently executing the dialog - sal_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_bExecuting : 1; /// we're currently executing the dialog + bool m_bCanceled : 1; /// endDialog was called while we were executing + bool m_bTitleAmbiguous : 1; /// m_sTitle has not been set yet 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? diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 7ba41421248f..8617d3ac1fab 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -80,7 +80,7 @@ private: short mnRPercent; short mnGPercent; short mnBPercent; - sal_Bool mbInvert; + bool mbInvert; sal_uInt8 mcTransparency; GraphicDrawMode meDrawMode; @@ -89,8 +89,8 @@ public: GraphicAttr(); ~GraphicAttr(); - sal_Bool operator==( const GraphicAttr& rAttr ) const; - sal_Bool operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); } + bool operator==( const GraphicAttr& rAttr ) const; + bool operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); } void SetDrawMode( GraphicDrawMode eDrawMode ) { meDrawMode = eDrawMode; } GraphicDrawMode GetDrawMode() const { return meDrawMode; } @@ -129,22 +129,22 @@ public: void SetGamma( double fGamma ) { mfGamma = fGamma; } double GetGamma() const { return mfGamma; } - void SetInvert( sal_Bool bInvert ) { mbInvert = bInvert; } - sal_Bool IsInvert() const { return mbInvert; } + void SetInvert( bool bInvert ) { mbInvert = bInvert; } + bool IsInvert() const { return mbInvert; } void SetTransparency( sal_uInt8 cTransparency ) { mcTransparency = cTransparency; } sal_uInt8 GetTransparency() const { return mcTransparency; } - sal_Bool IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); } - sal_Bool IsMirrored() const { return( mnMirrFlags != 0UL ); } - sal_Bool IsCropped() const + bool IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); } + bool IsMirrored() const { return( mnMirrFlags != 0UL ); } + bool IsCropped() const { return( mnLeftCrop != 0 || mnTopCrop != 0 || mnRightCrop != 0 || mnBottomCrop != 0 ); } - sal_Bool IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); } - sal_Bool IsTransparent() const { return( mcTransparency > 0 ); } - sal_Bool IsAdjusted() const + bool IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); } + bool IsTransparent() const { return( mcTransparency > 0 ); } + bool IsAdjusted() const { return( mnLumPercent != 0 || mnContPercent != 0 || mnRPercent != 0 || mnGPercent != 0 || mnBPercent != 0 || mfGamma != 1.0 || mbInvert ); @@ -175,13 +175,13 @@ private: Timer* mpSwapOutTimer; GrfSimpleCacheObj* mpSimpleCache; sal_uLong mnAnimationLoopCount; - sal_Bool mbAutoSwapped : 1; - sal_Bool mbTransparent : 1; - sal_Bool mbAnimated : 1; - sal_Bool mbEPS : 1; - sal_Bool mbIsInSwapIn : 1; - sal_Bool mbIsInSwapOut : 1; - sal_Bool mbAlpha : 1; + bool mbAutoSwapped : 1; + bool mbTransparent : 1; + bool mbAnimated : 1; + bool mbEPS : 1; + bool mbIsInSwapIn : 1; + bool mbIsInSwapOut : 1; + bool mbAlpha : 1; void SVT_DLLPRIVATE ImplConstruct(); void SVT_DLLPRIVATE ImplAssignGraphicData(); @@ -191,14 +191,14 @@ private: const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplAutoSwapIn(); - sal_Bool SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; } - sal_Bool SVT_DLLPRIVATE ImplGetCropParams( + bool SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; } + bool SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, PolyPolygon& rClipPolyPoly, - sal_Bool& bRectClipRegion + bool& bRectClipRegion ) const; /** Render a given number of tiles in an optimized way @@ -294,7 +294,7 @@ private: const Size& rCropRightBottom, const Rectangle& rCropRect, const Size& rDstSize, - sal_Bool bEnlarge + bool bEnlarge ) const; DECL_LINK( ImplAutoSwapOutHdl, void* ); @@ -319,10 +319,10 @@ public: ~GraphicObject(); GraphicObject& operator=( const GraphicObject& rCacheObj ); - sal_Bool operator==( const GraphicObject& rCacheObj ) const; - sal_Bool operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } + bool operator==( const GraphicObject& rCacheObj ) const; + bool operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } - sal_Bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } + bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } void SetSwapStreamHdl(); void SetSwapStreamHdl(const Link& rHdl); sal_uLong GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } @@ -332,7 +332,7 @@ public: GraphicManager& GetGraphicManager() const { return *mpMgr; } - sal_Bool IsCached( + bool IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -380,12 +380,12 @@ public: void SetAttr( const GraphicAttr& rAttr ); const GraphicAttr& GetAttr() const { return maAttr; } - sal_Bool HasLink() const { return !maLink.isEmpty(); } + bool HasLink() const { return !maLink.isEmpty(); } void SetLink(); void SetLink( const OUString& rLink ); OUString GetLink() const { return maLink; } - sal_Bool HasUserData() const { return !maUserData.isEmpty(); } + bool HasUserData() const { return !maUserData.isEmpty(); } void SetUserData(); void SetUserData( const OUString& rUserData ); OUString GetUserData() const { return maUserData; } @@ -396,10 +396,10 @@ public: const Size& GetPrefSize() const { return maPrefSize; } const MapMode& GetPrefMapMode() const { return maPrefMapMode; } sal_uLong GetSizeBytes() const { return mnSizeBytes; } - sal_Bool IsTransparent() const { return mbTransparent; } - sal_Bool IsAlpha() const { return mbAlpha; } - sal_Bool IsAnimated() const { return mbAnimated; } - sal_Bool IsEPS() const { return mbEPS; } + bool IsTransparent() const { return mbTransparent; } + bool IsAlpha() const { return mbAlpha; } + bool IsAnimated() const { return mbAnimated; } + bool IsEPS() const { return mbEPS; } Link GetAnimationNotifyHdl() const { return maGraphic.GetAnimationNotifyHdl(); } @@ -407,10 +407,10 @@ public: bool SwapOut( SvStream* pOStm ); bool SwapIn(); - sal_Bool IsInSwapIn() const { return mbIsInSwapIn; } - sal_Bool IsInSwapOut() const { return mbIsInSwapOut; } - sal_Bool IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); } - sal_Bool IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } + bool IsInSwapIn() const { return mbIsInSwapIn; } + bool IsInSwapOut() const { return mbIsInSwapOut; } + bool IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); } + bool IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } void SetSwapState(); bool Draw( @@ -421,7 +421,7 @@ public: sal_uLong nFlags = GRFMGR_DRAW_STANDARD ); - sal_Bool DrawWithPDFHandling( + bool DrawWithPDFHandling( OutputDevice& rOutDev, const Point& rPt, const Size& rSz, @@ -462,7 +462,7 @@ public: @return sal_True, if drawing completed successfully */ - sal_Bool DrawTiled( + bool DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, @@ -472,7 +472,7 @@ public: int nTileCacheSize1D=128 ); - sal_Bool StartAnimation( + bool StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -521,17 +521,17 @@ private: GraphicManager( const GraphicManager& ) {} GraphicManager& operator=( const GraphicManager& ) { return *this; } - sal_Bool SVT_DLLPRIVATE ImplDraw( + bool SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, const sal_uLong nFlags, - sal_Bool& rCached + bool& rCached ); - sal_Bool SVT_DLLPRIVATE ImplCreateOutput( + bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -540,7 +540,7 @@ private: const sal_uLong nFlags, BitmapEx* pBmpEx = NULL ); - sal_Bool SVT_DLLPRIVATE ImplCreateOutput( + bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -583,11 +583,11 @@ private: const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj ); - inline sal_Bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); } + inline bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); } // Only used in swap case by GraphicObject void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ); - sal_Bool SVT_DLLPRIVATE ImplFillSwappedGraphicObject( + bool SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); @@ -604,14 +604,14 @@ public: void SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, - sal_Bool bDestroyGreaterCached = sal_False + bool bDestroyGreaterCached = false ); void SetCacheTimeout( sal_uLong nTimeoutSeconds ); void ReleaseFromCache( const GraphicObject& rObj ); - sal_Bool IsInCache( + bool IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -619,14 +619,14 @@ public: const GraphicAttr& rAttr ) const; - sal_Bool DrawObj( + bool DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, const sal_uLong nFlags, - sal_Bool& rCached + bool& rCached ); }; diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index d8057c1b8198..c53c056885b6 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -38,7 +38,7 @@ GraphicAttr::GraphicAttr() : mnRPercent ( 0 ), mnGPercent ( 0 ), mnBPercent ( 0 ), - mbInvert ( sal_False ), + mbInvert ( false ), mcTransparency ( 0 ), meDrawMode ( GRAPHICDRAWMODE_STANDARD ) { @@ -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 ) && ( mnMirrFlags == rAttr.mnMirrFlags ) && @@ -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.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; if( aCompat.GetVersion() >= 2 ) diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index d3b66d24f5d0..087d27be6872 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -126,9 +126,9 @@ void GraphicObject::ImplConstruct() mpSwapOutTimer = NULL; mpSimpleCache = NULL; mnAnimationLoopCount = 0; - mbAutoSwapped = sal_False; - mbIsInSwapIn = sal_False; - mbIsInSwapOut = sal_False; + mbAutoSwapped = false; + mbIsInSwapIn = false; + mbIsInSwapOut = false; } void GraphicObject::ImplAssignGraphicData() @@ -189,13 +189,13 @@ void GraphicObject::ImplAutoSwapIn() if( IsSwappedOut() ) { if( mpMgr && mpMgr->ImplFillSwappedGraphicObject( *this, maGraphic ) ) - mbAutoSwapped = sal_False; + mbAutoSwapped = false; else { - mbIsInSwapIn = sal_True; + mbIsInSwapIn = true; if( maGraphic.SwapIn() ) - mbAutoSwapped = sal_False; + mbAutoSwapped = false; else { SvStream* pStream = GetSwapStream(); @@ -238,7 +238,7 @@ void GraphicObject::ImplAutoSwapIn() } } - mbIsInSwapIn = sal_False; + mbIsInSwapIn = false; if( !mbAutoSwapped && mpMgr ) mpMgr->ImplGraphicObjectWasSwappedIn( *this ); @@ -246,10 +246,10 @@ void GraphicObject::ImplAutoSwapIn() } } -sal_Bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, - PolyPolygon& rClipPolyPoly, sal_Bool& bRectClipRegion ) const +bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, + PolyPolygon& rClipPolyPoly, bool& bRectClipRegion ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( GetType() != GRAPHIC_NONE ) { @@ -263,10 +263,10 @@ sal_Bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& if( nRot10 ) { aClipPoly.Rotate( rPt, nRot10 ); - bRectClipRegion = sal_False; + bRectClipRegion = false; } else - bRectClipRegion = sal_True; + bRectClipRegion = true; rClipPolyPoly = aClipPoly; @@ -308,7 +308,7 @@ sal_Bool GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rPt = aOriginPoly[ 0 ]; } - bRet = sal_True; + bRet = true; } } @@ -329,7 +329,7 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj ) maLink = rGraphicObj.maLink; maUserData = rGraphicObj.maUserData; ImplAssignGraphicData(); - mbAutoSwapped = sal_False; + mbAutoSwapped = false; mpMgr = rGraphicObj.mpMgr; mpMgr->ImplRegisterObj( *this, maGraphic, NULL, &rGraphicObj ); @@ -338,7 +338,7 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj ) return *this; } -sal_Bool GraphicObject::operator==( const GraphicObject& rGraphicObj ) const +bool GraphicObject::operator==( const GraphicObject& rGraphicObj ) const { return( ( rGraphicObj.maGraphic == maGraphic ) && ( rGraphicObj.maAttr == maAttr ) && @@ -491,10 +491,10 @@ void GraphicObject::GraphicManagerDestroyed() ImplSetGraphicManager( NULL ); } -sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, +bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicAttr* pAttr, sal_uLong nFlags ) const { - sal_Bool bRet; + bool bRet; if( nFlags & GRFMGR_DRAW_CACHED ) { @@ -503,13 +503,13 @@ sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Si if ( pAttr && pAttr->IsCropped() ) { PolyPolygon aClipPolyPoly; - sal_Bool bRectClip; + bool bRectClip; ImplGetCropParams( pOut, aPt, aSz, pAttr, aClipPolyPoly, bRectClip ); } bRet = mpMgr->IsInCache( pOut, aPt, aSz, *this, ( pAttr ? *pAttr : GetAttr() ) ); } else - bRet = sal_False; + bRet = false; return bRet; } @@ -527,8 +527,8 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, Point aPt( rPt ); Size aSz( rSz ); const sal_uInt32 nOldDrawMode = pOut->GetDrawMode(); - sal_Bool bCropped = aAttr.IsCropped(); - sal_Bool bCached = sal_False; + bool bCropped = aAttr.IsCropped(); + bool bCached = false; bool bRet; // #i29534# Provide output rects for PDF writer @@ -556,8 +556,8 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, if( bCropped ) { PolyPolygon aClipPolyPoly; - sal_Bool bRectClip; - const sal_Bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); + bool bRectClip; + const bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); pOut->Push( PUSH_CLIPREGION ); @@ -598,7 +598,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, } // #i105243# -sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, +bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, const Point& rPt, const Size& rSz, const GraphicAttr* pGrfAttr, const sal_uLong nFlags ) @@ -606,7 +606,7 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, const GraphicAttr aGrfAttr( pGrfAttr ? *pGrfAttr : GetAttr() ); // Notify PDF writer about linked graphic (if any) - sal_Bool bWritingPdfLinkedGraphic( sal_False ); + bool bWritingPdfLinkedGraphic( false ); Point aPt( rPt ); Size aSz( rSz ); Rectangle aCropRect; @@ -628,8 +628,8 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, if( aGrfAttr.IsCropped() ) { PolyPolygon aClipPolyPoly; - sal_Bool bRectClip; - const sal_Bool bCrop = ImplGetCropParams( &rOutDev, + bool bRectClip; + const bool bCrop = ImplGetCropParams( &rOutDev, aPt, aSz, &aGrfAttr, aClipPolyPoly, @@ -644,7 +644,7 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, } } - sal_Bool bRet = Draw( &rOutDev, rPt, rSz, &aGrfAttr, nFlags ); + bool bRet = Draw( &rOutDev, rPt, rSz, &aGrfAttr, nFlags ); // Notify PDF writer about linked graphic (if any) if( bWritingPdfLinkedGraphic ) @@ -658,11 +658,11 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, return bRet; } -sal_Bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, +bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, const Size& rOffset, const GraphicAttr* pAttr, sal_uLong nFlags, int nTileCacheSize1D ) { if( pOut == NULL || rSize.Width() == 0 || rSize.Height() == 0 ) - return sal_False; + return false; const MapMode aOutMapMode( pOut->GetMapMode() ); const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); @@ -680,11 +680,11 @@ sal_Bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, c return ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D ); } -sal_Bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, +bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData, const GraphicAttr* pAttr, sal_uLong /*nFlags*/, OutputDevice* pFirstFrameOutDev ) { - sal_Bool bRet = sal_False; + bool bRet = false; GetGraphic(); @@ -696,13 +696,13 @@ sal_Bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, co { Point aPt( rPt ); Size aSz( rSz ); - sal_Bool bCropped = aAttr.IsCropped(); + bool bCropped = aAttr.IsCropped(); if( bCropped ) { PolyPolygon aClipPolyPoly; - sal_Bool bRectClip; - const sal_Bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); + bool bRectClip; + const bool bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); pOut->Push( PUSH_CLIPREGION ); @@ -729,7 +729,7 @@ sal_Bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, co if( bCropped ) pOut->Pop(); - bRet = sal_True; + bRet = true; } else bRet = Draw( pOut, rPt, rSz, &aAttr, GRFMGR_DRAW_STANDARD ); @@ -760,7 +760,7 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pC mpSwapOutTimer->Stop(); maGraphic = rGraphic; - mbAutoSwapped = sal_False; + mbAutoSwapped = false; ImplAssignGraphicData(); maLink = ""; delete mpSimpleCache, mpSimpleCache = NULL; @@ -945,7 +945,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo // cropping affects this frame, apply it then // do _not_ apply enlargement, this is done below ImplTransformBitmap( aAnimBmp.aBmpEx, rAttr, Size(), Size(), - aCropRectRel, rDestSize, sal_False ); + aCropRectRel, rDestSize, false ); aAnim.Replace( aAnimBmp, nFrame ); } @@ -990,7 +990,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo else { ImplTransformBitmap( aBitmapEx, rAttr, aCropLeftTop, aCropRightBottom, - aCropRect, rDestSize, sal_True ); + aCropRect, rDestSize, true ); aTransGraphic = aBitmapEx; } @@ -1104,7 +1104,7 @@ void GraphicObject::SetSwapState() { if( !IsSwappedOut() ) { - mbAutoSwapped = sal_True; + mbAutoSwapped = true; if( mpMgr ) mpMgr->ImplGraphicObjectWasSwappedOut( *this ); @@ -1115,7 +1115,7 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) { if( !IsSwappedOut() ) { - mbIsInSwapOut = sal_True; + mbIsInSwapOut = true; SvStream* pStream = GetSwapStream(); @@ -1135,7 +1135,7 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) } } - mbIsInSwapOut = sal_False; + mbIsInSwapOut = false; } if( mpSwapOutTimer ) @@ -1149,11 +1149,11 @@ SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) VersionCompat aCompat( rIStm, STREAM_READ ); Graphic aGraphic; GraphicAttr aAttr; - sal_Bool bLink; + bool bLink; ReadGraphic( rIStm, aGraphic ); ReadGraphicAttr( rIStm, aAttr ); - rIStm.ReadUChar( bLink ); + rIStm.ReadCharAsBool( bLink ); rGraphicObj.SetGraphic( aGraphic ); rGraphicObj.SetAttr( aAttr ); @@ -1174,7 +1174,7 @@ SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - const sal_Bool bLink = rGraphicObj.HasLink(); + const bool bLink = rGraphicObj.HasLink(); WriteGraphic( rOStm, rGraphicObj.GetGraphic() ); WriteGraphicAttr( rOStm, rGraphicObj.GetAttr() ); diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index f1048e10a8ae..295b4e05faf1 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -64,7 +64,7 @@ void GraphicManager::SetMaxCacheSize( sal_uLong 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 ); } @@ -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 GraphicAttr& rAttr ) const { 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, - const sal_uLong nFlags, sal_Bool& rCached ) + const sal_uLong nFlags, bool& rCached ) { Point aPt( rPt ); 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 ) ) { @@ -126,7 +126,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si aGraphic.Draw( pOut, aPt, aSz ); } - bRet = sal_True; + bRet = true; } if( !bRet ) @@ -135,7 +135,7 @@ sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Si if( !mpCache->DrawDisplayCacheObj( pOut, aPt, aSz, rObj, rAttr ) ) bRet = ImplDraw( pOut, aPt, aSz, rObj, rAttr, nFlags, rCached ); else - bRet = rCached = sal_True; + bRet = rCached = true; } } @@ -171,7 +171,7 @@ OString GraphicManager::ImplGetUniqueID( const GraphicObject& rObj ) const 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 ) ); } @@ -181,13 +181,13 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& 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 GraphicAttr& rAttr, - const sal_uLong nFlags, sal_Bool& rCached ) + const sal_uLong nFlags, bool& rCached ) { const Graphic& rGraphic = rObj.GetGraphic(); - sal_Bool bRet = sal_False; + bool bRet = false; if( rGraphic.IsSupportedGraphic() && !rGraphic.IsSwapOut() ) { @@ -205,7 +205,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &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, if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) ) { rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx ); - bRet = sal_True; + bRet = true; } } else { 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, if( aGraphic.IsSupportedGraphic() ) { aGraphic.Draw( pOut, rPt, rSz ); - bRet = sal_True; + bRet = true; } } } @@ -259,7 +259,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, 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, long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ) @@ -818,7 +818,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAt return bRet; } -sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, +bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, const Point& rPoint, const Size& rSize, const BitmapEx& rBitmapEx, const GraphicAttr& rAttributes, const sal_uLong /*nFlags*/, BitmapEx* pBmpEx ) @@ -1036,7 +1036,7 @@ static BitmapEx checkMetadataBitmap( const BitmapEx& rBmpEx, return aBmpEx; } -sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, +bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr, const sal_uLong /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ) @@ -1345,7 +1345,7 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, rOutBmpEx = BitmapEx(); } - return sal_True; + return true; } void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ) @@ -1632,7 +1632,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, // #105229# Switch off mapping (converting to logic and back to // pixel might cause roundoff errors) - sal_Bool bOldMap( rVDev.IsMapModeEnabled() ); + bool bOldMap( rVDev.IsMapModeEnabled() ); rVDev.EnableMapMode( false ); bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY, @@ -1988,7 +1988,7 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, const Size& rCropRightBottom, const Rectangle& rCropRect, const Size& rDstSize, - sal_Bool bEnlarge ) const + bool bEnlarge ) const { // #107947# Extracted from svdograf.cxx diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 771420065f1f..1b149dca502d 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -48,9 +48,9 @@ namespace svt OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext) :OPropertyContainer(GetBroadcastHelper()) ,m_pDialog(NULL) - ,m_bExecuting(sal_False) - ,m_bCanceled(sal_False) - ,m_bTitleAmbiguous(sal_True) + ,m_bExecuting(false) + ,m_bCanceled(false) + ,m_bTitleAmbiguous(true) ,m_bInitialized( false ) ,m_bNeedInitialization( false ) ,m_aContext(_rxContext) @@ -112,7 +112,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con if (UNODIALOG_PROPERTY_ID_TITLE == nHandle) { // from now on m_sTitle is valid - m_bTitleAmbiguous = sal_False; + m_bTitleAmbiguous = false; if (m_pDialog) m_pDialog->SetText(m_sTitle); @@ -212,8 +212,8 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e *this ); - m_bCanceled = sal_False; - m_bExecuting = sal_True; + m_bCanceled = false; + m_bExecuting = true; if ( !impl_ensureDialog_lck() ) return 0; @@ -238,7 +238,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException, std::e // get the settings of the dialog executedDialog( nReturn ); - m_bExecuting = sal_False; + m_bExecuting = false; } // outta here |