diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-18 15:41:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-20 09:52:08 +0200 |
| commit | dcefc97c8bd5be9ba229098c32d2a5c73d084163 (patch) | |
| tree | 860caac40b5c15ddb3cd1297316975d7034b260e /vcl/source/gdi/impimage.cxx | |
| parent | 953f327818f565969b8de5d9b956bd6b9a7c64b2 (diff) | |
convert IMAGE_DRAW_ constants to scoped enum
Change-Id: I75619eeb902af4953a5ac1525605cf3f0f15e2c0
Diffstat (limited to 'vcl/source/gdi/impimage.cxx')
| -rw-r--r-- | vcl/source/gdi/impimage.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 184e5b192e85..067b6e8ab95e 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -170,7 +170,7 @@ void ImplImageBmp::Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHe } void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, - const Point& rPos, sal_uInt16 nStyle, + const Point& rPos, DrawImageFlags nStyle, const Size* pSize ) { if( pOutDev->IsDeviceOutputNecessary() ) @@ -180,15 +180,15 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, aOutSize = ( pSize ? *pSize : pOutDev->PixelToLogic( maSize ) ); - if( nStyle & IMAGE_DRAW_DISABLE ) + if( nStyle & DrawImageFlags::Disable ) { ImplUpdateDisabledBmpEx( nPos); pOutDev->DrawBitmapEx( rPos, aOutSize, aSrcPos, maSize, maDisabledBmpEx ); } else { - if( nStyle & ( IMAGE_DRAW_COLORTRANSFORM | - IMAGE_DRAW_HIGHLIGHT | IMAGE_DRAW_DEACTIVE | IMAGE_DRAW_SEMITRANSPARENT ) ) + if( nStyle & ( DrawImageFlags::ColorTransform | + DrawImageFlags::Highlight | DrawImageFlags::Deactive | DrawImageFlags::SemiTransparent ) ) { BitmapEx aTmpBmpEx; const Rectangle aCropRect( aSrcPos, maSize ); @@ -202,7 +202,7 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, Bitmap aTmpBmp( aTmpBmpEx.GetBitmap() ); - if( nStyle & ( IMAGE_DRAW_HIGHLIGHT | IMAGE_DRAW_DEACTIVE ) ) + if( nStyle & ( DrawImageFlags::Highlight | DrawImageFlags::Deactive ) ) { BitmapWriteAccess* pAcc = aTmpBmp.AcquireWriteAccess(); @@ -218,7 +218,7 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, boost::scoped_array<sal_uInt8> pMapB(new sal_uInt8[ 256 ]); long nX, nY; - if( nStyle & IMAGE_DRAW_HIGHLIGHT ) + if( nStyle & DrawImageFlags::Highlight ) aColor = rSettings.GetHighlightColor(); else aColor = rSettings.GetDeactiveColor(); @@ -278,7 +278,7 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, } } - if( nStyle & IMAGE_DRAW_SEMITRANSPARENT ) + if( nStyle & DrawImageFlags::SemiTransparent ) { if( aTmpBmpEx.IsTransparent() ) { |