[Libreoffice-commits] core.git: framework/source

[Maxim Monastirsky]

 framework/source/uielement/resourcemenucontroller.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 769f640558dbaf787059bd8131f174a9b1e6d7d0
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Sep 22 12:54:49 2016 +0300

    tdf#102355 Fix disabling entries via dispatch interception
    
    ... in ResourceMenuController based top-level menus.
    MenuBarManager doesn't set frame action listener for
    top-level. This wasn't an issue when top-level always
    was the menubar, but now top-level can be a popup menu.
    
    Change-Id: Ibc9116389239eb06f84a2e53b31eacc0a09d438e

diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 0b65e07..33956f3 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -324,6 +324,7 @@ void ResourceMenuController::itemActivated( const css::awt::MenuEvent& /*rEvent*
         css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( m_xFrame, css::uno::UNO_QUERY );
         m_xMenuBarManager.set( new framework::MenuBarManager(
             m_xContext, m_xFrame, m_xURLTransformer, xDispatchProvider, m_aModuleName, pAwtMenu->GetMenu(), false, true, !m_bContextMenu && !m_bInToolbar ) );
+        m_xFrame->addFrameActionListener( m_xMenuBarManager.get() );
     }
 }