diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-19 11:20:25 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-01-19 11:23:04 +0200 |
| commit | c3e6d12301b42a44bd0d4584005686e324533b60 (patch) | |
| tree | 9265273b884413cea94337cdf59e0e6f8cab2860 /sfx2/source/control/dispatch.cxx | |
| parent | 41ef8d6df116c72f81bfa19c8e067a412c7f46db (diff) | |
Using SfxDispatcher was not that good idea after all
Being a context menu it will append verbs if OLE object
is selected. Also most existing clients of context menu
interception check only current selection context, not
the menu URL (because it didn't work prior to 5.2, see
release notes), so again we might get unwanted items.
For now, just instantiate the menu controller directly.
Change-Id: Idfca6a81c12bfb6623805d5337e313eb8611f4bc
Diffstat (limited to 'sfx2/source/control/dispatch.cxx')
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index fefdf6aa87ab..b56fa9cb6168 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1942,7 +1942,7 @@ void SfxDispatcher::ExecutePopup( vcl::Window *pWin, const Point *pPos ) } } -void SfxDispatcher::ExecutePopup( const OUString& rResName, vcl::Window* pWin, const Point* pPos, PopupMenuFlags nFlags ) +void SfxDispatcher::ExecutePopup( const OUString& rResName, vcl::Window* pWin, const Point* pPos ) { css::uno::Sequence< css::uno::Any > aArgs( 3 ); aArgs[0] <<= comphelper::makePropertyValue( "Value", rResName ); @@ -1987,7 +1987,7 @@ void SfxDispatcher::ExecutePopup( const OUString& rResName, vcl::Window* pWin, c OUString aMenuURL = "private:resource/popupmenu/" + rResName; if (pVCLMenu && GetFrame()->GetViewShell()->TryContextMenuInterception(*pVCLMenu, aMenuURL, aEvent)) { - pVCLMenu->Execute(pWindow, Rectangle(aPos, aPos), nFlags); + pVCLMenu->Execute(pWindow, aPos); } } |