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 /vcl/workben | |
| parent | b7939ff897a173086643819451c7b2b4553c11c3 (diff) | |
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 'vcl/workben')
| -rw-r--r-- | vcl/workben/icontest.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/svpclient.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index eac9f8c8d59e..35ea9510d442 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -115,7 +115,7 @@ void MyWorkWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectan BitmapEx aEmpty; mpFixedBitmap->SetBitmap( aEmpty ); GraphicConversionParameters aConv( aSize ); - mpBitmap = new BitmapEx( maGraphic.GetBitmap( aConv ) ); + mpBitmap = new BitmapEx(maGraphic.GetBitmapEx( aConv )); mpFixedBitmap->SetBitmap( *mpBitmap ); mpFixedBitmap->SetSizePixel( aSize ); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 8763ab398636..c84919cb59aa 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -266,14 +266,14 @@ IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void) GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter(); rFilter.ImportGraphic( aGraphicResult, OUString("import"), aStream ); - Bitmap aBitmap = aGraphicResult.GetBitmap(); + BitmapEx aBitmap = aGraphicResult.GetBitmapEx(); SAL_INFO("vcl", "got bitmap of size " << aBitmap.GetSizePixel().Width() << "x" << aBitmap.GetSizePixel().Height()); Size aFixedSize( aBitmap.GetSizePixel() ); aFixedSize.AdjustWidth(10 ); aFixedSize.AdjustHeight(10 ); m_aImage->SetSizePixel( aFixedSize ); - m_aImage->SetImage( Image( BitmapEx( aBitmap ) ) ); + m_aImage->SetImage( Image( aBitmap ) ); } |