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

[Caolán McNamara]

 cui/source/dialogs/cuigaldlg.cxx |   11 ++++++-----
 cui/source/inc/gallery.hrc       |    5 -----
 2 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 0884f14bbfcb3479933f0c5cfcec694ee9e78f52
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 3 12:17:47 2017 +0100

    fix missing gallery icons
    
    Change-Id: Ie0d8acebcf9d30802296814c58a35244eb813748

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index fd6bd4b6b59b..018f78b71719 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -35,6 +35,7 @@
 #include <svx/galtheme.hxx>
 #include "cuigaldlg.hxx"
 #include "helpid.hrc"
+#include "bitmaps.hlst"
 #include <unotools/syslocale.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -682,16 +683,16 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
     m_pFtMSShowChangeDate->SetText( aAccess );
 
     // set image
-    sal_uInt16 nId;
+    OUString sId;
 
     if( pThm->IsReadOnly() )
-        nId = RID_SVXBMP_THEME_READONLY_BIG;
+        sId = RID_SVXBMP_THEME_READONLY_BIG;
     else if( pThm->IsDefault() )
-        nId = RID_SVXBMP_THEME_DEFAULT_BIG;
+        sId = RID_SVXBMP_THEME_DEFAULT_BIG;
     else
-        nId = RID_SVXBMP_THEME_NORMAL_BIG;
+        sId = RID_SVXBMP_THEME_NORMAL_BIG;
 
-    m_pFiMSImage->SetImage(Image(BitmapEx(CUI_RES(nId))));
+    m_pFiMSImage->SetImage(Image(BitmapEx(sId)));
 }
 
 
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index c8c2d108fa32..221aa9bd5f6e 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -25,9 +25,4 @@
 #define RID_SVXSTR_GALLERY_ALLFILES             (RID_CUI_GALLERY_START + 44)
 #define RID_SVXSTR_GALLERY_ID_EXISTS            (RID_CUI_GALLERY_START + 81)
 
-// Images
-#define RID_SVXBMP_THEME_NORMAL_BIG             (RID_CUI_GALLERY_START + 49)
-#define RID_SVXBMP_THEME_READONLY_BIG           (RID_CUI_GALLERY_START + 53)
-#define RID_SVXBMP_THEME_DEFAULT_BIG            (RID_CUI_GALLERY_START + 55)
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */