diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-05 17:16:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-05 17:16:17 +0000 |
| commit | 08f7304fa3ed174ea47e9c90a21ed64219b1a969 (patch) | |
| tree | a1b5d3de1c8943c513b3ba816dbb7b99cf53771a /svx | |
| parent | e7a3a9104a4ab5709583b7506b0bd10ec6163fba (diff) | |
drop these intermediate Images and use BitmapEx directly
Change-Id: Ief15df1722bb59323563c21d76f5af624fbef8c9
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/gallery.hrc | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/gallery.src | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 659166d13612..b710d7cc13af 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -58,8 +58,8 @@ #define RID_SVXBMP_THEME_NORMAL (RID_SVX_GALLERY_START + 48) #define RID_SVXBMP_THEME_READONLY (RID_SVX_GALLERY_START + 52) #define RID_SVXBMP_THEME_DEFAULT (RID_SVX_GALLERY_START + 54) -#define RID_SVXIMG_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56) -#define RID_SVXIMG_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) +#define RID_SVXBMP_GALLERY_VIEW_ICON (RID_SVX_GALLERY_START + 56) +#define RID_SVXBMP_GALLERY_VIEW_LIST (RID_SVX_GALLERY_START + 57) // Gallery-Bitmaps fuer Sounds #define RID_SVXBMP_GALLERY_SOUND_1 (RID_SVX_GALLERY_START + 62) 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 |