diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:22:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:22:12 +0000 |
| commit | 55eb656b63d05aefeaca6158a1b07f2cc558157f (patch) | |
| tree | c8c3c859e6c63e9552afc03b7f5bd5c366874c2e /sfx2 | |
| parent | 01c105f07ca00dda57319122b6aeb8284b3abb85 (diff) | |
INTEGRATION: CWS iconswitching1 (1.50.16); FILE MERGED
2005/11/30 15:00:51 kendy 1.50.16.3: RESYNC: (1.51-1.53); FILE MERGED
2005/11/02 01:28:51 kendy 1.50.16.2: RESYNC: (1.50-1.51); FILE MERGED
2005/07/20 13:48:39 kendy 1.50.16.1: #i36518#
Cleanup after cutnpaste in CWS oooicons
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 7309d55cfef0..04dd721c75e5 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tbxitem.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: kz $ $Date: 2005-11-11 14:24:46 $ + * last change: $Author: kz $ $Date: 2006-01-05 18:22:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1707,24 +1707,6 @@ SfxPopupWindow* SfxAppToolBoxControl_Impl::CreatePopupWindow() return 0; } -static sal_Int16 GetCurrentSymbolSet() -{ - sal_Int16 eOptSymbolSet = SvtMiscOptions().GetSymbolSet(); - - if ( eOptSymbolSet == SFX_SYMBOLS_AUTO ) - { - // Use system settings, we have to retrieve the toolbar icon size from the - // Application class - ULONG nStyleIconSize = Application::GetSettings().GetStyleSettings().GetToolbarIconSize(); - if ( nStyleIconSize == STYLE_TOOLBAR_ICONSIZE_LARGE ) - eOptSymbolSet = SFX_SYMBOLS_LARGE; - else - eOptSymbolSet = SFX_SYMBOLS_SMALL; - } - - return eOptSymbolSet; -} - void SfxAppToolBoxControl_Impl::SetImage( const String &rURL ) { /* We accept URL's here only, which exist as items of our internal popup menu. @@ -1736,7 +1718,7 @@ void SfxAppToolBoxControl_Impl::SetImage( const String &rURL ) if (!bValid) aURL = sFallback; - BOOL bBig = ( GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ); + BOOL bBig = SvtMiscOptions().AreCurrentSymbolsLarge(); BOOL bHC = GetToolBox().GetBackground().GetColor().IsDark(); Image aImage = SvFileInformationManager::GetImageNoDefault( INetURLObject( aURL ), bBig, bHC ); if ( !aImage ) |