summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-10-18 14:17:57 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-10-18 17:27:57 +0300
commitb088d89d00cd0716a50219f4eef4da080393fd63 (patch)
tree4ef1de562ba9240691fdb26685ef6436c0d290f5 /vcl
parent1cb46e27475d5b026de0e5aafb339ca16a26822c (diff)
Skip the placeholder added by PopupMenu::ImplExecute
Change-Id: I7766a63aff240141342db8b4a9236f5930236b13
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 94931cf31478..2d321682fe46 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -253,6 +253,11 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries)
GtkSalMenuItem *pSalMenuItem = GetItemAtPos( nItem );
sal_uInt16 nId = pSalMenuItem->mnId;
+ // PopupMenu::ImplExecute might add <No Selection Possible> entry to top-level
+ // popup menu, but we have our own implementation below, so skip that one.
+ if ( nId == 0xFFFF )
+ continue;
+
if ( pSalMenuItem->mnType == MenuItemType::SEPARATOR )
{
// Delete extra items from current section.