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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index b7e194854c4f..eebc880f2540 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -631,7 +631,7 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& Bitmap aMask( rBitmapEx.GetBitmap().CreateMask( rColor, nTol ) ); if( rBitmapEx.IsTransparent() ) - aMask.CombineSimple( rBitmapEx.GetMask(), BMP_COMBINE_OR ); + aMask.CombineSimple( rBitmapEx.GetMask(), BmpCombine::Or ); aBmpEx = BitmapEx( rBitmapEx.GetBitmap(), aMask ); LeaveWait(); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 11d559f958e1..c8c20df1a58c 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -691,7 +691,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) aMask = aBmp.CreateMask( rColor, nTol ); if( aGraphic.IsTransparent() ) - aMask.CombineSimple( aGraphic.GetBitmapEx().GetMask(), BMP_COMBINE_OR ); + aMask.CombineSimple( aGraphic.GetBitmapEx().GetMask(), BmpCombine::Or ); if( !!aMask ) { |