diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-05 16:58:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-05 16:58:26 +0000 |
| commit | 4d5fd9308746792009c678b2b822248c33f1689a (patch) | |
| tree | b923b1037efdd190a58ae0847301c66d8736fa6c /svx/source/dialog/cfg.cxx | |
| parent | 59e289c9d269791a5f2d5528a50556ab4c2cc382 (diff) | |
INTEGRATION: CWS iconswitching1 (1.22.32); FILE MERGED
2005/12/16 15:29:07 ka 1.22.32.4: RESYNC: (1.24-1.25); FILE MERGED
2005/11/30 13:28:38 kendy 1.22.32.3: RESYNC: (1.23-1.24); FILE MERGED
2005/11/01 11:51:25 kendy 1.22.32.2: RESYNC: (1.22-1.23); FILE MERGED
2005/07/20 13:48:31 kendy 1.22.32.1: #i36518#
Cleanup after cutnpaste in CWS oooicons
Diffstat (limited to 'svx/source/dialog/cfg.cxx')
| -rw-r--r-- | svx/source/dialog/cfg.cxx | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/svx/source/dialog/cfg.cxx b/svx/source/dialog/cfg.cxx index eb6a0568a9b9..e3cc6173c8d0 100644 --- a/svx/source/dialog/cfg.cxx +++ b/svx/source/dialog/cfg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cfg.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: obo $ $Date: 2005-12-21 16:18:26 $ + * last change: $Author: kz $ $Date: 2006-01-05 17:58:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -424,22 +424,7 @@ void InitImageType() css::ui::ImageType::COLOR_NORMAL | css::ui::ImageType::SIZE_DEFAULT; - 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; - } - - if ( eOptSymbolSet != SFX_SYMBOLS_SMALL ) + if ( SvtMiscOptions().AreCurrentSymbolsLarge() ) { theImageType |= css::ui::ImageType::SIZE_LARGE; } |