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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index ad4432cbb248..dfae122b03ab 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -308,8 +308,8 @@ SfxAppMenuControl_Impl::SfxAppMenuControl_Impl( { // Determine the current background color setting for menus const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - m_nSymbolsStyle = rSettings.GetSymbolsStyle(); - m_bShowMenuImages = rSettings.GetUseImagesInMenus(); + m_sIconTheme = rSettings.DetermineIconTheme(); + m_bShowMenuImages = rSettings.GetUseImagesInMenus(); ::framework::MenuConfiguration aConf( ::comphelper::getProcessComponentContext() ); Reference<com::sun::star::frame::XFrame> aXFrame( GetBindings().GetDispatcher_Impl()->GetFrame()->GetFrame().GetFrameInterface() ); @@ -332,14 +332,14 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) if ( pActMenu ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - sal_uIntPtr nSymbolsStyle = rSettings.GetSymbolsStyle(); + OUString sIconTheme = rSettings.DetermineIconTheme(); sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); - if (( nSymbolsStyle != m_nSymbolsStyle ) || + if (( sIconTheme != m_sIconTheme ) || ( bShowMenuImages != m_bShowMenuImages )) { - m_nSymbolsStyle = nSymbolsStyle; - m_bShowMenuImages = bShowMenuImages; + m_sIconTheme = sIconTheme; + m_bShowMenuImages = bShowMenuImages; sal_uInt16 nCount = pActMenu->GetItemCount(); for ( sal_uInt16 nSVPos = 0; nSVPos < nCount; nSVPos++ ) @@ -350,7 +350,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) if ( bShowMenuImages ) { sal_Bool bImageSet = sal_False; - ::rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId ); |