diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-08 16:18:32 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:17:14 -0500 |
| commit | f2c17cd76e7e941dbd5cdf20d0a6514bc65083a8 (patch) | |
| tree | 2513e9a1175d02f2f192986385b01ddc0c0caceb /sfx2 | |
| parent | f519c90e60b1e9fc63f5d16b5c53cd243a5d151c (diff) | |
convert BmpConversion to scoped enum
and drop unused 4BIT_TRANS and 1BIT_MATRIX enumerators
Also fix a bug in x11::convertBitmapDepth where we were incorrectly
passing BmpConversion enumeratirs to ReduceColors
Reviewed-on: https://gerrit.libreoffice.org/34062
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit b5699cd01b6a52906880c107bac6f3802ea7353d)
Change-Id: I903c6866750e46ee752e10a17c05fcaaf6b11242
(cherry picked from commit 2d171734f349c0f9868106f57f5644a70fbeb945)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/graphhelp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index c54a0df748a4..16f1e683d913 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -704,7 +704,7 @@ IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl, Idle *, void) aBmp.Scale( nYRatio, nYRatio ); // Convert to true color, to allow CopyPixel - aBmp.Convert( BMP_CONVERSION_24BIT ); + aBmp.Convert( BmpConversion::N24Bit ); // and copy it into the Any SvMemoryStream aData; diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 542c8ff4aef2..c2a7fe298335 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -191,7 +191,7 @@ bool GraphicHelper::getThumbnailFormatFromGDI_Impl(GDIMetaFile* pMetaFile, const BitmapEx aResultBitmap; - bResult = pMetaFile->CreateThumbnail(aResultBitmap, 256, BMP_CONVERSION_8BIT_COLORS, BmpScaleFlag::Default); + bResult = pMetaFile->CreateThumbnail(aResultBitmap, 256, BmpConversion::N8BitColors, BmpScaleFlag::Default); if (!bResult || aResultBitmap.IsEmpty()) return false; |