diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-19 10:31:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-19 10:31:57 +0000 |
| commit | d840f9f0791a9335bd42af9152c058eac322b056 (patch) | |
| tree | f40bc044369d514b038ed35820fee7395c8a8dc0 /sfx2/source/appl/newhelp.cxx | |
| parent | fbbcda285587febec5faf5279a99a9b56f750d4c (diff) | |
INTEGRATION: CWS oooicons (1.97.18); FILE MERGED
2004/10/29 15:56:44 cd 1.97.18.1: #i35368# Removed all obsolete occurrences of SfxImageManager - added a static image list manager
Diffstat (limited to 'sfx2/source/appl/newhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 8b2dc20da8ab..d0db828c9750 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.cxx,v $ * - * $Revision: 1.100 $ + * $Revision: 1.101 $ * - * last change: $Author: obo $ $Date: 2004-11-17 13:34:47 $ + * last change: $Author: obo $ $Date: 2004-11-19 11:31:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2215,11 +2215,29 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const return bRet; } +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 SfxHelpTextWindow_Impl::InitToolBoxImages() { - sal_Bool bLarge = ( SfxImageManager::GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ); + sal_Bool bLarge = ( GetCurrentSymbolSet() == SFX_SYMBOLS_LARGE ); sal_Bool bHiContrast = GetBackground().GetColor().IsDark(); aIndexOnImage = Image( SfxResId( |