diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-01 15:04:45 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:12 -0500 |
| commit | bc5cb0ccfa5d4826f43409b52adfc73a277aef36 (patch) | |
| tree | 60ace3fc3fe8fab643f31b5cb62dcc16822f6855 /filter | |
| parent | 9ca19666511b1d44ba554a70cbbc0c8e2db844c6 (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>
(cherry picked from commit 52360bf8dd567598593cb212ac85f0c919315618)
(cherry picked from commit af8e50a21ad47aa15fe3773c053735f8321fcf46)
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 1a8d53138700..8bbfbca3f724 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3827,7 +3827,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 ); } } |