diff options
| author | Tobias Lippert <drtl@fastmail.fm> | 2014-02-09 00:53:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-21 17:23:50 +0000 |
| commit | 076a7eacca48f203f0a8b9aa537e88fea9a88409 (patch) | |
| tree | cd95446ac0b80b29658fa2a44030dacb5304a63d /framework/source/uielement/menubarmanager.cxx | |
| parent | 1ec263e25d8606c70ac2089d5ceea22750d25daf (diff) | |
Bug #63962 Dynamically scan the config directory for icon themes
The hard-coded icon themes have been replaced by a dynamic list
which is filled by scanning the config directory
Conflicts:
include/vcl/settings.hxx
vcl/source/app/settings.cxx
vcl/source/window/window.cxx
Change-Id: Ie3680ffe27d06e375acf22753e036cb6ddabc4ed
Reviewed-on: https://gerrit.libreoffice.org/7935
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/source/uielement/menubarmanager.cxx')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index ec6e8469257e..aca7a24becaf 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -178,7 +178,7 @@ MenuBarManager::MenuBarManager( , m_aListenerContainer( m_aLock.getShareableOslMutex() ) , m_xContext(rxContext) , m_xURLTransformer(_xURLTransformer) - , m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() ) + , m_sIconTheme( SvtMiscOptions().GetIconTheme() ) { m_xPopupMenuControllerFactory = frame::thePopupMenuControllerFactory::get(m_xContext); FillMenuManager( pMenu, rFrame, rDispatchProvider, rModuleIdentifier, bDelete, bDeleteChildren ); @@ -200,7 +200,7 @@ MenuBarManager::MenuBarManager( , m_aListenerContainer( m_aLock.getShareableOslMutex() ) , m_xContext(rxContext) , m_xURLTransformer(_xURLTransformer) - , m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() ) + , m_sIconTheme( SvtMiscOptions().GetIconTheme() ) { Init(rFrame,pAddonMenu,bDelete,bDeleteChildren); } @@ -221,7 +221,7 @@ MenuBarManager::MenuBarManager( , m_aListenerContainer( m_aLock.getShareableOslMutex() ) , m_xContext(rxContext) , m_xURLTransformer(_xURLTransformer) - , m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() ) + , m_sIconTheme( SvtMiscOptions().GetIconTheme() ) { Init(rFrame,pAddonPopupMenu,bDelete,bDeleteChildren,true); } @@ -821,15 +821,15 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) MenuManager::UpdateSpecialWindowMenu( pMenu, m_xContext, m_aLock ); // Check if some modes have changed so we have to update our menu images - sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle(); + OUString sIconTheme = SvtMiscOptions().GetIconTheme(); if ( m_bRetrieveImages || bShowMenuImages != m_bShowMenuImages || - nSymbolsStyle != m_nSymbolsStyle ) + sIconTheme != m_sIconTheme ) { m_bShowMenuImages = bShowMenuImages; m_bRetrieveImages = sal_False; - m_nSymbolsStyle = nSymbolsStyle; + m_sIconTheme = sIconTheme; MenuManager::FillMenuImages( m_xFrame, pMenu, bShowMenuImages ); } |