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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/app/transobj.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index c516cb209de7..9e2db5f9b04c 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -712,7 +712,7 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa Bitmap aBitmap; ReadDIB(aBitmap, aMemStrm, false); - XOBitmap aXOBitmap( aBitmap ); + XOBitmap aXOBitmap(( BitmapEx(aBitmap) )); aXOBitmap.Bitmap2Array(); if( aXOBitmap.GetBackgroundColor() == COL_BLACK ) ::std::swap( aPattColor, aBackColor ); diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 7a9dc8749eb0..37d37b9fd2e1 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -376,7 +376,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt PaintToDev( pVirtDev, m_pDoc, 1.0, m_aBlock ); pVirtDev->SetMapMode( MapMode( MapUnit::MapPixel ) ); - Bitmap aBmp = pVirtDev->GetBitmap( Point(), pVirtDev->GetOutputSize() ); + BitmapEx aBmp = pVirtDev->GetBitmapEx( Point(), pVirtDev->GetOutputSize() ); bOK = SetBitmapEx( aBmp, rFlavor ); } else if ( nFormat == SotClipboardFormatId::GDIMETAFILE ) |