diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-03-06 20:59:21 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:31 -0400 |
| commit | 3601b4cfb6bf9ba90036cfad8b5672c306f2a286 (patch) | |
| tree | 1713ee07af852efd38f46a2b9240393e450f9253 /sfx2 | |
| parent | 83644c8438a449eed20cd1cf52b0d78fb37b5b7b (diff) | |
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
(cherry picked from commit 1f9374af4f8ea343db0c239d2449893ac4efc675)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 976ee4407236..88f9b102d520 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1934,7 +1934,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 ); |