SwapIn/SwapOut can return bool + sal_Bool to bool

Change-Id: Ia5477d6bb83af38435b9ac44359fe2f46b00807c

1 files changed, 8 insertions, 8 deletions

diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index a1d619ab2918..d3b66d24f5d0 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1055,9 +1055,9 @@ Graphic GraphicObject::GetTransformedGraphic( const GraphicAttr* pAttr ) const /
     return aGraphic;
 }
 
-sal_Bool GraphicObject::SwapOut()
+bool GraphicObject::SwapOut()
 {
-    sal_Bool bRet = ( !mbAutoSwapped ? maGraphic.SwapOut() : sal_False );
+    const bool bRet = !mbAutoSwapped && maGraphic.SwapOut();
 
     if( bRet && mpMgr )
         mpMgr->ImplGraphicObjectWasSwappedOut( *this );
@@ -1065,9 +1065,9 @@ sal_Bool GraphicObject::SwapOut()
     return bRet;
 }
 
-sal_Bool GraphicObject::SwapOut( SvStream* pOStm )
+bool GraphicObject::SwapOut( SvStream* pOStm )
 {
-    sal_Bool bRet = ( !mbAutoSwapped ? maGraphic.SwapOut( pOStm ) : sal_False );
+    const bool bRet = !mbAutoSwapped && maGraphic.SwapOut( pOStm );
 
     if( bRet && mpMgr )
         mpMgr->ImplGraphicObjectWasSwappedOut( *this );
@@ -1075,17 +1075,17 @@ sal_Bool GraphicObject::SwapOut( SvStream* pOStm )
     return bRet;
 }
 
-sal_Bool GraphicObject::SwapIn()
+bool GraphicObject::SwapIn()
 {
-    sal_Bool bRet;
+    bool bRet = false;
 
     if( mbAutoSwapped )
     {
         ImplAutoSwapIn();
-        bRet = sal_True;
+        bRet = true;
     }
     else if( mpMgr && mpMgr->ImplFillSwappedGraphicObject( *this, maGraphic ) )
-        bRet = sal_True;
+        bRet = true;
     else
     {
         bRet = maGraphic.SwapIn();