summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-08 16:18:32 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2017-12-05 08:17:14 -0500
commitf2c17cd76e7e941dbd5cdf20d0a6514bc65083a8 (patch)
tree2513e9a1175d02f2f192986385b01ddc0c0caceb /sd
parentf519c90e60b1e9fc63f5d16b5c53cd243a5d151c (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 'sd')
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 7a285f93cd19..a143e4625055 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -654,7 +654,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
else
aBmp.Scale( nYRatio, nYRatio );
- aBmp.Convert( BMP_CONVERSION_24BIT );
+ aBmp.Convert( BmpConversion::N24Bit );
pImg->SetImage(Image(aBmp));
}
else