framework/source/uielement/menubarmanager.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit b41deb2ef057c3bd43fa61448bb4d7299138c8d4
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Sun Jan 24 00:40:56 2016 +0200
Manually reset the active flag for popup menus
Change-Id: I942f42bbc43e041a7dae1e83663171c0f2978378
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 39ffad0..f9e94ba 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1035,6 +1035,11 @@ IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu,
bool )
xDispatch->dispatch( aTargetURL, aArgs );
}
+ if ( !m_bHasMenuBar )
+ // Standalone popup menu doesn't fire deactivate event in this case,
+ // so we have to reset the active flag here.
+ m_bActive = false;
+
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
