diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:10:52 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:10:52 +0000 |
| commit | b1efd7773af618af812e4486e12769ef6a30bb20 (patch) | |
| tree | 34e3a4d17c9db6686599bd48a0ab4f4f32507309 /framework/source/uiconfiguration/moduleimagemanager.cxx | |
| parent | 8fce26a47faab07970a2d852447e440994381ac5 (diff) | |
INTEGRATION: CWS iconswitching1 (1.10.10); FILE MERGED
2005/11/01 21:07:52 kendy 1.10.10.2: RESYNC: (1.10-1.11); FILE MERGED
2005/07/20 14:04:04 kendy 1.10.10.1: #i36518#
Implement the icon switching
Diffstat (limited to 'framework/source/uiconfiguration/moduleimagemanager.cxx')
| -rw-r--r-- | framework/source/uiconfiguration/moduleimagemanager.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 9aec3a5a7c..44d4ebd275 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: moduleimagemanager.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:50:22 $ + * last change: $Author: kz $ $Date: 2006-01-05 18:10:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -114,6 +114,10 @@ #include <vcl/pngwrite.hxx> #endif +#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX +#include "svtools/miscopt.hxx" +#endif + //_________________________________________________________________________________________________________________ // namespaces //_________________________________________________________________________________________________________________ @@ -204,7 +208,8 @@ static GlobalImageList* getGlobalImageList( const uno::Reference< XMultiServiceF CmdImageList::CmdImageList( const uno::Reference< XMultiServiceFactory >& rServiceManager, const rtl::OUString& aModuleIdentifier ) : m_aModuleIdentifier( aModuleIdentifier ), m_bVectorInit( sal_False ), - m_xServiceManager( rServiceManager ) + m_xServiceManager( rServiceManager ), + m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() ) { for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) m_pImageList[n] = 0; @@ -284,6 +289,16 @@ void CmdImageList::impl_fillCommandToImageNameMap() ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType ) { + SvtMiscOptions aMiscOptions; + + sal_Int16 nSymbolsStyle = aMiscOptions.GetCurrentSymbolsStyle(); + if ( nSymbolsStyle != m_nSymbolsStyle ) + { + m_nSymbolsStyle = nSymbolsStyle; + for ( sal_Int32 n=0; n < ImageType_COUNT; n++ ) + delete m_pImageList[n], m_pImageList[n] = NULL; + } + if ( !m_pImageList[nImageType] ) { m_pImageList[nImageType] = new ImageList( m_aImageNameVector, |