diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 10:05:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 20:12:18 +0200 |
| commit | c96d58cca2503fd257c3c742188af66075e194de (patch) | |
| tree | da6b75a8fdce10b6e7da23105ae09aac69e02c88 /filter | |
| parent | Improve handling of _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING (diff) | |
| download | core-c96d58cca2503fd257c3c742188af66075e194de.tar.gz core-c96d58cca2503fd257c3c742188af66075e194de.zip | |
use more BitmapEx in filter
Change-Id: I68fdad6a69a178df8c59c4272f1d8d0b2f101315
Reviewed-on: https://gerrit.libreoffice.org/55163
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/mstoolbar.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index ed50eaaccca2..ecfa1f7ee318 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -298,7 +298,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect // according to the spec: // "the iconMask is white in all the areas in which the icon is // displayed as transparent and is black in all other areas." - aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().CreateMask( COL_WHITE ) ); + aBitEx = BitmapEx( aBitEx.GetBitmap(), pSpecificInfo->getIconMask()->getBitMap().GetBitmap().CreateMask( COL_WHITE ) ); Graphic aGraphic( aBitEx ); helper.addIcon( aGraphic.GetXGraphic(), sCommand ); @@ -720,7 +720,7 @@ bool TBCBitMap::Read( SvStream& rS) nOffSet = rS.Tell(); rS.ReadInt32( cbDIB ); // cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10 - return ReadDIB(mBitMap, rS, false, true); + return ReadDIBBitmapEx(mBitMap, rS, false, true); } #ifdef DEBUG_FILTER_MSTOOLBAR |