From 33894f76b4555e2261cd723fd5fc93998b42aae1 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Mon, 2 Apr 2012 20:26:24 +0100
Subject: fdo#34324 - fix colorspace conversion for greyscale bitmaps

Signed-off-by: Andras Timar <timar74@gmail.com>
---
 sfx2/source/appl/shutdowniconunx.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 9ce5ff0de697..d65765dfaa6c 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -90,6 +90,9 @@ static GdkPixbuf * ResIdToPixbuf( sal_uInt16 nResId )
     Bitmap pInSalBitmap = aIcon.GetBitmap();
     AlphaMask pInSalAlpha = aIcon.GetAlpha();
 
+    if( pInSalBitmap.GetBitCount() != 24 )
+        pInSalBitmap.Convert( BMP_CONVERSION_24BIT );
+
     Bitmap::ScopedReadAccess pSalBitmap(pInSalBitmap);
     AlphaMask::ScopedReadAccess pSalAlpha(pInSalAlpha);
 
-- 
cgit