diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-01 11:57:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-01 11:57:55 +0000 |
| commit | cbdd12b2fc3af44647f0879bdd6cb349d0d877b3 (patch) | |
| tree | 91b1e98e11d943478d296d58a8e154213ec9f8fc /svx | |
| parent | acf1ed1fd393c58b0a65e9c9e633ac15515af01d (diff) | |
INTEGRATION: CWS impress83 (1.26.240); FILE MERGED
2006/01/19 10:59:43 sj 1.26.240.1: #i60764# fixed gpf when exiting office under solaris (after using the gallery)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 2ed7726c7b55..dad531928bee 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -4,9 +4,9 @@ * * $RCSfile: galbrws1.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2005-09-08 23:05:37 $ + * last change: $Author: kz $ $Date: 2006-02-01 12:57:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -153,7 +153,11 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, Control ( pParent, rResId ), maNewTheme ( this, WB_3DLOOK ), mpThemes ( new GalleryThemeListBox( this, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_HSCROLL | WB_VSCROLL | WB_AUTOHSCROLL | WB_SORT ) ), - mpGallery ( pGallery ) + mpGallery ( pGallery ), + aImgNormal ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_NORMAL ) ), + aImgDefault ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_DEFAULT ) ), + aImgReadOnly( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) ), + aImgImported( GalleryResGetBitmapEx( RID_SVXBMP_THEME_IMPORTED ) ) { StartListening( *mpGallery ); @@ -195,11 +199,6 @@ ULONG GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ) if( pEntry && ( !pEntry->IsHidden() || bShowHiddenThemes ) ) { - 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; if( pEntry->IsImported() ) |