diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-27 09:43:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-27 12:59:23 +0000 |
| commit | 850a8d27ca696f18ce0c529346f8bb8505499545 (patch) | |
| tree | 5641e81912760029683e1c544e01af25eee23523 /sw/source/core/graphic | |
| parent | 6c974272423ca19c94d8d5e182fec46836309d60 (diff) | |
Convert GRAPHIC to scoped enum
Change-Id: I1fd09a729cbda00f99841532e0dd3fa66bce7bea
Reviewed-on: https://gerrit.libreoffice.org/25534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/core/graphic')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index eabdb9f21bd6..7b513136c254 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -234,7 +234,7 @@ bool SwGrfNode::ReRead( bReadGrf = true; } // Was the graphic already loaded? - else if( !bNewGrf && GRAPHIC_NONE != maGrfObj.GetType() ) + else if( !bNewGrf && GraphicType::NONE != maGrfObj.GetType() ) return true; else { @@ -523,15 +523,15 @@ bool SwGrfNode::SwapIn( bool bWaitForData ) if( pLink ) { - if( GRAPHIC_NONE == maGrfObj.GetType() || - GRAPHIC_DEFAULT == maGrfObj.GetType() ) + if( GraphicType::NONE == maGrfObj.GetType() || + GraphicType::Default == maGrfObj.GetType() ) { // link was not loaded yet if( pLink->SwapIn( bWaitForData ) ) { bRet = true; } - else if( GRAPHIC_DEFAULT == maGrfObj.GetType() ) + else if( GraphicType::Default == maGrfObj.GetType() ) { // no default bitmap anymore, thus re-paint delete mpReplacementGraphic; @@ -603,8 +603,8 @@ bool SwGrfNode::SwapIn( bool bWaitForData ) bool SwGrfNode::SwapOut() { - if( maGrfObj.GetType() != GRAPHIC_DEFAULT && - maGrfObj.GetType() != GRAPHIC_NONE && + if( maGrfObj.GetType() != GraphicType::Default && + maGrfObj.GetType() != GraphicType::NONE && !maGrfObj.IsSwappedOut() && !bInSwapIn ) { if( refLink.Is() ) @@ -900,7 +900,7 @@ SvStream* SwGrfNode::GetStreamForEmbedGrf( if ( !_refPics->hasByName( sStreamName ) || !_refPics->isStreamElement( sStreamName ) ) { - if ( GetGrfObj().GetType() != GRAPHIC_NONE ) + if ( GetGrfObj().GetType() != GraphicType::NONE ) { const sal_Int32 nExtPos = sStreamName.indexOf('.'); const OUString aExtStr = (nExtPos>=0) ? sStreamName.copy( nExtPos ) : OUString(); |