summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-02-08 16:18:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-09 08:42:06 +0000
commitb5699cd01b6a52906880c107bac6f3802ea7353d (patch)
tree131315b3755ddf31d56a5359b24a387d9e1ec2e0 /sd
parentExplorer File View option in Settings working now (diff)
downloadcore-b5699cd01b6a52906880c107bac6f3802ea7353d.tar.gz
core-b5699cd01b6a52906880c107bac6f3802ea7353d.zip
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 Change-Id: I903c6866750e46ee752e10a17c05fcaaf6b11242 Reviewed-on: https://gerrit.libreoffice.org/34062 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.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 7bcadbcbe4d8..a6a6bb466dc8 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -652,7 +652,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