diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-01 12:59:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-01 14:33:11 +0200 |
| commit | 5c23560ba39fe17c75cafe3d495af743238e4d67 (patch) | |
| tree | d868af88ebbec737e4dd867ce3f650c1518b7556 /svx | |
| parent | c94d45cd08e2d5db5c007b9a77352f7621f84a09 (diff) | |
BmpCombine::And is dead
ever since
commit ddd2639a482befb4a3bf1f75a88e66c21a691b67
Date: Sat Feb 27 15:50:37 2021 +0200
drop mask from BitmapEx
Change-Id: I45fae0140067e2bfe5ce1ae2f5014ce733835ef1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118220
Tested-by: Jenkins
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 7f65bb697517..420321d2a9be 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -615,7 +615,7 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& Bitmap aMask( rBitmapEx.GetBitmap().CreateMask( rColor, nTol ) ); if( rBitmapEx.IsAlpha() ) - aMask.CombineSimple( rBitmapEx.GetAlpha(), BmpCombine::Or ); + aMask.CombineOr( rBitmapEx.GetAlpha() ); aBmpEx = BitmapEx( rBitmapEx.GetBitmap(), aMask ); LeaveWait(); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index c6fcde5d1dfc..712544ff0c01 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -634,7 +634,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) Bitmap aMask = aGraphic.GetBitmapEx().GetBitmap().CreateMask( rColor, nTol ); if( aGraphic.IsTransparent() ) - aMask.CombineSimple( aGraphic.GetBitmapEx().GetAlpha(), BmpCombine::Or ); + aMask.CombineOr( aGraphic.GetBitmapEx().GetAlpha() ); if( !aMask.IsEmpty() ) { |