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/inc | |
| 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/inc')
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index ce61dda63f7c..88ef560c91fd 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -246,7 +246,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xDeferedItemContainer; - sal_Int16 m_nSymbolsStyle; + OUString m_sIconTheme; Timer m_aAsyncSettingsTimer; }; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 7542b2950206..14462bba0648 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -210,7 +210,7 @@ class ToolBarManager : public ToolbarManager_Base, CommandToInfoMap m_aCommandMap; SubToolBarToSubToolBarControllerMap m_aSubToolBarControllerMap; Timer m_aAsyncUpdateControllersTimer; - sal_Int16 m_nSymbolsStyle; + OUString m_sIconTheme; MenuDescriptionMap m_aMenuMap; sal_Bool m_bAcceleratorCfg; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager; |