summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-24 12:19:49 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-24 12:23:47 +0000
commitb8ee342576b707dbffe877f5c225b640ee65276d (patch)
tree71af09e6b36a37f4c8c23b1cce44aab366520afc /vcl
parenta16159e50cc0c2e1a0d654080343ac03bfa518fc (diff)
gtk3: handle items without commands
e.g. the draw/impress context menus. Handle these like MenuManager::Activate does Change-Id: I02a0e377a2d3a57ac7ac9239aaa75dbb856489d2
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/gtksalmenu.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 49270bbe111e..f31d51524b33 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -52,7 +52,9 @@ static gchar* GetCommandForItem( GtkSalMenuItem* pSalMenuItem, gchar* aCurrentCo
if ( !pMenu )
return nullptr;
- OUString aMenuCommand = pMenu->GetItemCommand( nId );
+ OUString aMenuCommand = pMenu->GetItemCommand(nId);
+ if (aMenuCommand.isEmpty())
+ aMenuCommand = "slot:" + OUString::number(nId);
gchar* aCommandStr = g_strdup( OUStringToOString( aMenuCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
aCommand = g_strdup( aCommandStr );