diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-31 17:00:49 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-06-01 11:14:43 +0200 |
| commit | 36ad2b13371a24d99dcec16a60b48d895e0228aa (patch) | |
| tree | 1d1cc5e345438e7a05db93f1ceebb2786d1735bf /framework/source/fwe/helper/actiontriggerhelper.cxx | |
| parent | 6c4135416f79aebf02afa58d6d125f5c175b34d7 (diff) | |
drop Image(Bitmap) constructor
and convert some more code from Bitmap to BitmapEx
Change-Id: Icf3c18608e0bb608408fe69722441cfa19f6b161
Reviewed-on: https://gerrit.libreoffice.org/55160
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'framework/source/fwe/helper/actiontriggerhelper.cxx')
| -rw-r--r-- | framework/source/fwe/helper/actiontriggerhelper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index efd1fd403521..b672a497635e 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -173,13 +173,13 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X // This is an unknown implementation of a XBitmap interface. We have to // use a more time consuming way to build an Image! Image aImage; - Bitmap aBitmap; + BitmapEx aBitmap; Sequence< sal_Int8 > aDIBSeq; { aDIBSeq = xBitmap->getDIB(); SvMemoryStream aMem( const_cast<sal_Int8 *>(aDIBSeq.getConstArray()), aDIBSeq.getLength(), StreamMode::READ ); - ReadDIB(aBitmap, aMem, true); + ReadDIBBitmapEx(aBitmap, aMem); } aDIBSeq = xBitmap->getMaskDIB(); @@ -188,7 +188,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(BitmapEx(aBitmap, aMaskBitmap)); + aImage = Image(BitmapEx(aBitmap.GetBitmap(), aMaskBitmap)); } else aImage = Image( aBitmap ); |