diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-14 15:50:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-14 16:12:08 +0000 |
| commit | 6391993d1ffb5ec6ce627671eb77925a4498946f (patch) | |
| tree | 407563c4df6db9dcc49c136769274b568df5ad46 | |
| parent | 39b68ccf5f31dd9fe364a68bb375c1020ef05c40 (diff) | |
move Image(Bitmap, MaskBitmap) code to last user of it
the last use looks rather dubious to me, I wonder if anything can really end up
here
Change-Id: I13314610405463122891b3ed0f311da65fd1d542
| -rw-r--r-- | framework/source/fwe/helper/actiontriggerhelper.cxx | 2 | ||||
| -rw-r--r-- | include/vcl/image.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/image/Image.cxx | 6 |
3 files changed, 1 insertions, 8 deletions
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index 33a171b22d87..d3873f5da4a0 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -189,7 +189,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X Bitmap aMaskBitmap; SvMemoryStream aMem( const_cast<sal_Int8 *>(aDIBSeq.getConstArray()), aDIBSeq.getLength(), StreamMode::READ ); ReadDIB(aMaskBitmap, aMem, true); - aImage = Image( aBitmap, aMaskBitmap ); + aImage = Image(BitmapEx(aBitmap, aMaskBitmap)); } else aImage = Image( aBitmap ); diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 04e832b847a6..519058a2dc64 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -59,7 +59,6 @@ public: explicit Image( const ResId& rResId ); explicit Image( const BitmapEx& rBitmapEx ); explicit Image( const Bitmap& rBitmap ); - Image( const Bitmap& rBitmap, const Bitmap& rMaskBitmap ); Image( const Bitmap& rBitmap, const Color& rColor ); explicit Image( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ); explicit Image( const OUString &rPNGFileUrl ); diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index e4dde10e4d5c..516883c8f170 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -77,12 +77,6 @@ Image::Image(const Bitmap& rBitmap) ImplInit(rBitmap); } -Image::Image(const Bitmap& rBitmap, const Bitmap& rMaskBitmap) -{ - const BitmapEx aBitmapEx(rBitmap, rMaskBitmap); - ImplInit(aBitmapEx); -} - Image::Image(const Bitmap& rBitmap, const Color& rColor) { const BitmapEx aBitmapEx(rBitmap, rColor); |