diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-30 13:02:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-31 14:08:44 +0200 |
| commit | d4442ac1ac9aae36dbc08fda8154d71ea0f81708 (patch) | |
| tree | 62fdc7419391dbf8c1cd92872ba2c9e12df2c4b6 /sd | |
| parent | Add entries for Calc.Applcation (diff) | |
| download | core-d4442ac1ac9aae36dbc08fda8154d71ea0f81708.tar.gz core-d4442ac1ac9aae36dbc08fda8154d71ea0f81708.zip | |
drop Graphic::GetBitmap
so that we flush out various code using Bitmap, in favour of using
BitmapEx.
This is part of the process of making Bitmap largely an internal detail
of vcl
Change-Id: Iaf2ead5e3d9960838723fb55b812b97108093d74
Reviewed-on: https://gerrit.libreoffice.org/55062
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuvect.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 95b46a89bb69..bd14bce7f6fe 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -623,7 +623,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, weld::TreeView&, void) m_pGraphicFilter->ImportGraphic( aGraphic, aURLObj, nFilter, nullptr, nFilterImportFlags ); } - Bitmap aBmp = aGraphic.GetBitmap(); + BitmapEx aBmp = aGraphic.GetBitmapEx(); sal_Int32 nBmpWidth = aBmp.GetSizePixel().Width(); sal_Int32 nBmpHeight = aBmp.GetSizePixel().Height(); diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index 7d51a805be5e..03fd915077b9 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -62,7 +62,9 @@ void FuVectorize::DoExecute( SfxRequest& ) if( pObj && dynamic_cast< const SdrGrafObj *>( pObj ) != nullptr ) { SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSdVectorizeDlg> pDlg(pFact ? pFact->CreateSdVectorizeDlg(mpWindow ? mpWindow->GetFrameWeld() : nullptr, static_cast<SdrGrafObj*>( pObj )->GetGraphic().GetBitmap(), mpDocSh ) : nullptr); + ScopedVclPtr<AbstractSdVectorizeDlg> pDlg( + pFact->CreateSdVectorizeDlg(mpWindow ? mpWindow->GetFrameWeld() : nullptr, + static_cast<SdrGrafObj*>( pObj )->GetGraphic().GetBitmapEx().GetBitmap(), mpDocSh ) ); if( pDlg && pDlg->Execute() == RET_OK ) { const GDIMetaFile& rMtf = pDlg->GetGDIMetaFile(); |