diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:42:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:42:05 +0000 |
| commit | de4e5eca93772866c9531bbbb49232352f2f2eaf (patch) | |
| tree | b88313bc2af6ca44733258d8e2ad5a8da381efe3 /svx | |
| parent | 2fd6daa087193fb3ce1bac0e32b06529da71b819 (diff) | |
INTEGRATION: CWS jmf5 (1.24.132); FILE MERGED
2005/02/24 11:05:00 ka 1.24.132.1: #i43341#: support for alpha icons
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index dac594a1d0c7..baaaf2f12f85 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: galbrws1.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: rt $ $Date: 2004-11-03 16:03:22 $ + * last change: $Author: vg $ $Date: 2005-03-23 12:42:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -221,14 +221,10 @@ ULONG GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ) if( pEntry && ( !pEntry->IsHidden() || bShowHiddenThemes ) ) { - Bitmap aBMP( GAL_RESID( RID_SVXBMP_THEME_NORMAL ) ); - static const Image aImgNormal( BitmapEx( aBMP, COL_LIGHTMAGENTA ) ); - aBMP = Bitmap( GAL_RESID( RID_SVXBMP_THEME_DEFAULT ) ); - static const Image aImgDefault( BitmapEx( aBMP, COL_LIGHTMAGENTA ) ); - aBMP = Bitmap( GAL_RESID( RID_SVXBMP_THEME_READONLY ) ); - static const Image aImgReadOnly( BitmapEx( aBMP, COL_LIGHTMAGENTA ) ); - aBMP = Bitmap( GAL_RESID( RID_SVXBMP_THEME_IMPORTED ) ); - static const Image aImgImported( BitmapEx( aBMP, COL_LIGHTMAGENTA ) ); + static const Image aImgNormal( GalleryResGetBitmapEx( RID_SVXBMP_THEME_NORMAL ) ); + static const Image aImgDefault( GalleryResGetBitmapEx( RID_SVXBMP_THEME_DEFAULT ) ); + static const Image aImgReadOnly( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) ); + static const Image aImgImported( GalleryResGetBitmapEx( RID_SVXBMP_THEME_IMPORTED ) ); const Image* pImage; |