summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-09-22 12:54:49 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-09-22 13:00:12 +0300
commit769f640558dbaf787059bd8131f174a9b1e6d7d0 (patch)
tree012f75b61a4224c506c6a46ff467aacafa2acf65
parent328310d52e0f52ed1ebbd23535a67a82693adc61 (diff)
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
-rw-r--r--framework/source/uielement/resourcemenucontroller.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 0b65e07d49c4..33956f3fd15f 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() );
}
}