diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 15:04:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-02 07:45:28 +0000 |
| commit | 52360bf8dd567598593cb212ac85f0c919315618 (patch) | |
| tree | a97967592055bbd07abf983db840a8b2ead77c77 /filter | |
| parent | ba9b66eecf9ced0d890ff9d6b7a6efda35825382 (diff) | |
convert BmpCombine to scoped enum and drop unused
Change-Id: Ic67474683a25a25e5753777f4bbbeded6ceba414
Reviewed-on: https://gerrit.libreoffice.org/33793
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index d2aeeebaed46..5e45f5bdafe4 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3826,7 +3826,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons Bitmap aBitmap( aBitmapEx.GetBitmap() ); Bitmap aMask( aBitmap.CreateMask( MSO_CLR_ToColor( nTransColor, DFF_Prop_pictureTransparent ), 9 ) ); if ( aBitmapEx.IsTransparent() ) - aMask.CombineSimple( aBitmapEx.GetMask(), BMP_COMBINE_OR ); + aMask.CombineSimple( aBitmapEx.GetMask(), BmpCombine::Or ); aGraf = BitmapEx( aBitmap, aMask ); } } |