diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-12 16:08:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-12 19:00:00 +0200 |
| commit | 203e3099c17bf245f8fcd52c32c58d47bd241c2b (patch) | |
| tree | 805b01deb02d3bc88582fb4812b4d94c94e65d03 /svx/source | |
| parent | f4932d61e52d595156af1f63e9fb4bed18b63254 (diff) | |
make Bitmap/BitmapEx constructors explicit
and add
BitmapEx::operator=(Bitmap const &)
Image::Image(Bitmap const &)
to lessen the fallout
Change-Id: Iff5fab88d167a7be739c370c9933d36c297bc61c
Reviewed-on: https://gerrit.libreoffice.org/54162
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 74955710061b..0256b719e9a4 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -908,7 +908,7 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color { Bitmap aBmp( rBmpEx.GetBitmap() ); aBmp.Replace( rBmpEx.GetMask(), rColor ); - return aBmp; + return BitmapEx(aBmp); } else return rBmpEx; diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index c4328daef724..a25c5d41faf4 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -224,7 +224,7 @@ bool XFillBitmapItem::operator==(const SfxPoolItem& rItem) const bool XFillBitmapItem::isPattern() const { BitmapColor aBack, aFront; - return isHistorical8x8(GetGraphicObject().GetGraphic().GetBitmap(), aBack, aFront); + return isHistorical8x8(GetGraphicObject().GetGraphic().GetBitmapEx(), aBack, aFront); } sal_uInt16 XFillBitmapItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const |