diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-08-13 08:49:30 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-08-15 17:13:55 +0200 |
| commit | 51599676667b2b6e81e51fc321a19033a3094773 (patch) | |
| tree | c35dbbfd3f79a648f59bb38ad5c5c8de96f5112b /sd | |
| parent | f3872785bd182e47ef9530770fb635d7e79e3f59 (diff) | |
remove constructor with plain Bitmap from Graphic, use BitmapEx
Change-Id: Ie429a10a8f54c6779d437ee4bc75a5ea0c427848
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100727
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/drawdoc4.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/vectdlg.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index c33f9d5f3f98..7eb550dea115 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -167,7 +167,7 @@ void SdDrawDocument::CreateLayoutTemplates() Size aNullSize( 32, 32 ); Bitmap aNullBmp( aNullSize, 8 ); aNullBmp.Erase( COL_WHITE ); - rISet.Put(XFillBitmapItem(Graphic(aNullBmp))); + rISet.Put(XFillBitmapItem(Graphic(BitmapEx(aNullBmp)))); // Shadow attributes (Drawing Engine) rISet.Put(makeSdrShadowItem(false)); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 843d593f5e28..dce0e837ac38 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -103,7 +103,7 @@ void SdVectorizeDlg::InitPreviewBmp() aPreviewBmp = aBmp; aPreviewBmp.Scale( aRect.GetSize() ); - m_aBmpWin.SetGraphic( aPreviewBmp ); + m_aBmpWin.SetGraphic(BitmapEx(aPreviewBmp)); } Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap const & rBmp, Fraction& rScale ) diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index c4ae7621a60c..1ecd4aa48efe 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -194,21 +194,21 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo { MetaBmpAction* pBmpAction = dynamic_cast< MetaBmpAction* >( pAction ); if( pBmpAction ) - aGraphic = Graphic( pBmpAction->GetBitmap() ); + aGraphic = Graphic(BitmapEx(pBmpAction->GetBitmap())); } break; case MetaActionType::BMPSCALE: { MetaBmpScaleAction* pBmpScaleAction = dynamic_cast< MetaBmpScaleAction* >( pAction ); if( pBmpScaleAction ) - aGraphic = Graphic( pBmpScaleAction->GetBitmap() ); + aGraphic = Graphic(BitmapEx(pBmpScaleAction->GetBitmap())); } break; case MetaActionType::BMPEX: { MetaBmpExAction* pBmpExAction = dynamic_cast< MetaBmpExAction* >( pAction ); if( pBmpExAction ) - aGraphic = Graphic( pBmpExAction->GetBitmapEx() ); + aGraphic = Graphic(pBmpExAction->GetBitmapEx() ); } break; case MetaActionType::BMPEXSCALE: |