sfx2/source/control/dispatch.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1f9374af4f8ea343db0c239d2449893ac4efc675
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Sun Mar 6 20:59:21 2016 +0200
Use menu URLs for context menu interception
This way it's clearer what this name stands for, as it's now
the same name that used to manipulate the same menus via the
XUIConfigurationManager API. It's also consistent with the
names we use for spelling/grammar (see SwView::ExecSpellPopup)
or read-only (see SwEditWin::Command) menus.
Change-Id: I0619578cea9d1f495168e2fa5060d1a664bfcd59
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 350277f..576a2b9 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1897,7 +1897,8 @@ void SfxDispatcher::ExecutePopup( const OUString&
rResName, vcl::Window *pWin, c
xPopupController->setPopupMenu( xPopupMenu );
VCLXMenu* pAwtMenu = VCLXMenu::GetImplementation( xPopupMenu );
PopupMenu* pVCLMenu = static_cast< PopupMenu* >( pAwtMenu->GetMenu() );
- if ( pVCLMenu && GetFrame()->GetViewShell()->TryContextMenuInterception(
*pVCLMenu, rResName, aEvent ) )
+ OUString aMenuURL = "private:resource/popupmenu/" + rResName;
+ if ( pVCLMenu && GetFrame()->GetViewShell()->TryContextMenuInterception(
*pVCLMenu, aMenuURL, aEvent ) )
pVCLMenu->Execute( pWindow, aPos );
css::uno::Reference< css::lang::XComponent > xComponent( xPopupController,
css::uno::UNO_QUERY );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
