[Libreoffice-commits] core.git: cui/source

Caolán McNamara caolanm at redhat.com
Sat Jan 14 14:35:54 UTC 2017


 cui/source/dialogs/cuigaldlg.cxx |    2 +-
 cui/source/dialogs/gallery.src   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6faba77920ce9847ed18d0e6849202c68277ad2d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 14 14:33:08 2017 +0000

    these bitmaps all have alpha channels, not replaceable magenta hack
    
    Change-Id: I5e4a433262f17cf4b7e7966687561202960bafa4

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index e7d5631..08b28da 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -690,7 +690,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
     else
         nId = RID_SVXBMP_THEME_NORMAL_BIG;
 
-    m_pFiMSImage->SetImage( Image( Bitmap( CUI_RES( nId ) ), COL_LIGHTMAGENTA ) );
+    m_pFiMSImage->SetImage(Image(BitmapEx(CUI_RES(nId))));
 }
 
 
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index 3dbb814..6c68a7c 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -45,17 +45,17 @@ String RID_SVXSTR_GALLERY_ID_EXISTS
 
 Bitmap RID_SVXBMP_THEME_NORMAL_BIG
 {
-    File = "galnorl.bmp" ;
+    File = "galnorl.png" ;
 };
 
 Bitmap RID_SVXBMP_THEME_READONLY_BIG
 {
-    File = "galrdol.bmp" ;
+    File = "galrdol.png" ;
 };
 
 Bitmap RID_SVXBMP_THEME_DEFAULT_BIG
 {
-    File = "galdefl.bmp" ;
+    File = "galdefl.png" ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list