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-11-28 00:12:52 -0500 |
| commit | af8e50a21ad47aa15fe3773c053735f8321fcf46 (patch) | |
| tree | f04e1f1fdd97c2ba1f523675c6aeb0111a025402 /svx | |
| parent | e540ccfb5eb43bd4a3d6920074dce8436720ba8e (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)
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 5eec4f8f7e8a..3a39830b182f 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -633,7 +633,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 fe8777945739..c3e6959041ec 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 ) { |