summaryrefslogtreecommitdiff
path: root/svx/source/gallery2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-12-05 17:16:17 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-12-05 17:16:17 +0000
commit08f7304fa3ed174ea47e9c90a21ed64219b1a969 (patch)
treea1b5d3de1c8943c513b3ba816dbb7b99cf53771a /svx/source/gallery2
parente7a3a9104a4ab5709583b7506b0bd10ec6163fba (diff)
drop these intermediate Images and use BitmapEx directly
Change-Id: Ief15df1722bb59323563c21d76f5af624fbef8c9
Diffstat (limited to 'svx/source/gallery2')
-rw-r--r--svx/source/gallery2/galbrws2.cxx4
-rw-r--r--svx/source/gallery2/gallery.src8
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 7e4cdcac4fc8..41ee2b86d22c 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1304,8 +1304,8 @@ IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl, LinkParamNone*, void)
{
maViewBox->SetOutStyle( maMiscOptions.GetToolboxStyle() );
- BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
- BitmapEx aListBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
+ BitmapEx aIconBmpEx(GAL_RES(RID_SVXBMP_GALLERY_VIEW_ICON));
+ BitmapEx aListBmpEx(GAL_RES(RID_SVXBMP_GALLERY_VIEW_LIST));
if( maMiscOptions.AreCurrentSymbolsLarge() )
{
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index abd82ce5b140..bbea8503d4c0 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -178,14 +178,14 @@ Bitmap RID_SVXBMP_GALLERY_SOUND_7
File = "galsnd7.png";
};
-Image RID_SVXIMG_GALLERY_VIEW_ICON
+Bitmap RID_SVXBMP_GALLERY_VIEW_ICON
{
- ImageBitmap = Bitmap { File = "galicon.png"; };
+ File = "galicon.png";
};
-Image RID_SVXIMG_GALLERY_VIEW_LIST
+Bitmap RID_SVXBMP_GALLERY_VIEW_LIST
{
- ImageBitmap = Bitmap { File = "gallist.png"; };
+ File = "gallist.png";
};
Menu RID_SVXMN_GALLERY1