summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-03 12:17:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-03 12:22:43 +0100
commit0884f14bbfcb3479933f0c5cfcec694ee9e78f52 (patch)
tree6ae4af495c38622bd58799c319882e45f69fa7d0 /cui
parentf12096272e684ddcd8ffa4e34dcb0a680cc594c2 (diff)
fix missing gallery icons
Change-Id: Ie0d8acebcf9d30802296814c58a35244eb813748
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx11
-rw-r--r--cui/source/inc/gallery.hrc5
2 files changed, 6 insertions, 10 deletions
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: */
In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae 2014-04-19fixincludeguards.sh: scThomas Arnhold sorry, huge one... 2014-03-27Second batch of adding SAL_OVERRIDE to overriding function declarationsStephan Bergmann ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f 2014-02-26cppuhelper: retrofit std::exception into overriding exception specsStephan Bergmann Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09