From 1caac283894d0deeac564c67cd816cc2907f9ac7 Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Thu, 17 Mar 2016 01:05:52 +0200
Subject: tdf#92049 NewMenuController: track icon theme changes too

Change-Id: I2f2c990b2cbacddf94bf74329d641d5a7e489773
---
 framework/inc/uielement/newmenucontroller.hxx    | 1 +
 framework/source/uielement/newmenucontroller.cxx | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'framework')

diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 23b324b13e82..293101c40b56 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -96,6 +96,7 @@ namespace framework
                                                                       m_bNewMenu    : 1,
                                                                       m_bModuleIdentified : 1,
                                                                       m_bAcceleratorCfg : 1;
+            OUString                                                  m_aIconTheme;
             OUString                                                  m_aTargetFrame;
             OUString                                                  m_aModuleIdentifier;
             OUString                                                  m_aEmptyDocURL;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index c48e66a055fb..5b997c1dcbc6 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -471,12 +471,14 @@ void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) thr
         {
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
             bool bShowImages( rSettings.GetUseImagesInMenus() );
+            OUString aIconTheme( rSettings.DetermineIconTheme() );
 
             PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu());
 
-            if ( m_bShowImages != bShowImages )
+            if ( m_bShowImages != bShowImages || m_aIconTheme != aIconTheme )
             {
                 m_bShowImages = bShowImages;
+                m_aIconTheme = aIconTheme;
                 setMenuImages( pVCLPopupMenu, m_bShowImages );
             }
 
@@ -540,6 +542,7 @@ void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments )
             const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
 
             m_bShowImages   = rSettings.GetUseImagesInMenus();
+            m_aIconTheme    = rSettings.DetermineIconTheme();
             m_bNewMenu      = m_aCommandURL == aSlotNewDocDirect;
         }
     }
-- 
cgit