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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/filter/exportdialog.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/filter/exportdialog.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 8f2dc48e1803..c58bad20cf80 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -517,14 +517,14 @@ void ExportDialog::GetGraphicStream() } } -Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream ) +BitmapEx ExportDialog::GetGraphicBitmap( SvStream& rInputStream ) { - Bitmap aRet; + BitmapEx aRet; Graphic aGraphic; GraphicFilter aFilter( false ); if ( aFilter.ImportGraphic( aGraphic, "", rInputStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast<css::uno::Sequence< css::beans::PropertyValue >*>(nullptr) ) == ERRCODE_NONE ) { - aRet = aGraphic.GetBitmap(); + aRet = aGraphic.GetBitmapEx(); } return aRet; } diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index d2aa54f1fb80..7d66df5a2c29 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -119,7 +119,7 @@ private: sal_Int32 mnMaxFilesizeForRealtimePreview; std::unique_ptr<SvMemoryStream> mpTempStream; - Bitmap maBitmap; + BitmapEx maBitmap; css::awt::Size maOriginalSize; // the original graphic size in 1/100mm css::awt::Size maSize; // for vector graphics it always contains the logical size in 1/100mm @@ -158,7 +158,7 @@ private: void GetGraphicSource(); void GetGraphicStream(); - static Bitmap GetGraphicBitmap( SvStream& rStream ); + static BitmapEx GetGraphicBitmap( SvStream& rStream ); css::uno::Sequence< css::beans::PropertyValue > GetFilterData( bool bUpdateConfig ); |