From b98f2cc3cf8bd2721ec8118af64edd3424c69dc2 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 8 Apr 2016 16:35:57 +0200 Subject: lok context menu: Handle the case we only get the slot-id. Change-Id: I7a2537ccebf80c79bf61f041bfb18cd6ddc93ca2 --- sfx2/source/control/dispatch.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'sfx2') diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 15681da2ac11..396f9936ad96 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -176,7 +176,14 @@ namespace { else { const sal_uInt16 nItemId = pMenu->GetItemId(nPos); - const OUString aCommandURL = pMenu->GetItemCommand(nItemId); + OUString aCommandURL = pMenu->GetItemCommand(nItemId); + + if (aCommandURL.isEmpty()) + { + const SfxSlot *pSlot = SFX_SLOTPOOL().GetSlot(nItemId); + if (pSlot) + aCommandURL = pSlot->GetCommandString(); + } const OUString aItemText = pMenu->GetItemText(nItemId); Menu* pPopupSubmenu = pMenu->GetPopupMenu(nItemId); -- cgit