diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-05 16:59:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-05 16:59:30 +0000 |
| commit | 1b2abb3bdd9fc82440d37c440a120bed51bfdd19 (patch) | |
| tree | dee2217b8c0ac85345e8dc2bfa5f549455cf2fed /svx | |
| parent | 93cb9c8eac7b137ccaa5a65c634311b64a23c8ee (diff) | |
INTEGRATION: CWS iconswitching1 (1.45.332); FILE MERGED
2005/11/30 13:37:25 kendy 1.45.332.3: RESYNC: (1.46-1.47); FILE MERGED
2005/11/01 13:13:35 kendy 1.45.332.2: RESYNC: (1.45-1.46); FILE MERGED
2005/07/20 13:48:33 kendy 1.45.332.1: #i36518#
Cleanup after cutnpaste in CWS oooicons
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 93a1655e8b42..ecda677df061 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: galbrws2.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: rt $ $Date: 2005-11-11 11:03:30 $ + * last change: $Author: kz $ $Date: 2006-01-05 17:59:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1222,21 +1222,14 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) IMPL_LINK( GalleryBrowser2, MiscHdl, void*, p ) { sal_uInt16 nIconResId, nListResId; - sal_Int16 eOptSymbolSet = maMiscOptions.GetSymbolSet(); const sal_Bool bHC = GALLERY_DLG_COLOR.IsDark(); - if( SFX_SYMBOLS_AUTO == eOptSymbolSet ) - { - eOptSymbolSet = ( Application::GetSettings().GetStyleSettings().GetToolbarIconSize() == STYLE_TOOLBAR_ICONSIZE_LARGE ) ? - SFX_SYMBOLS_LARGE : SFX_SYMBOLS_SMALL; - } - maViewBox.SetOutStyle( maMiscOptions.GetToolboxStyle() ); BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_ICON_HC : RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() ); BitmapEx aListBmpEx = BitmapEx( Image( GAL_RESID( bHC? RID_SVXIMG_GALLERY_VIEW_LIST_HC : RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() ); - if( SFX_SYMBOLS_SMALL != eOptSymbolSet ) + if( maMiscOptions.AreCurrentSymbolsLarge() ) { const Size aLargeSize( 24, 24); |