diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2018-03-15 16:48:18 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-27 12:23:00 +0200 |
| commit | b3259c54074deb54dc862fcb21fee48c707dd874 (patch) | |
| tree | 1b2d5175ed1ee50c2c2901bc61b7936a9773b73a /chart2 | |
| parent | 65823d698e7fc7e236fe3fcd5f23f0fe02a91b7e (diff) | |
chart2 lok: tunnel context menu of the chart edit view
Change-Id: I0c8b3cfe1666ad81f808871a87e4b0fa64ef593c
Reviewed-on: https://gerrit.libreoffice.org/51345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
(cherry picked from commit eb76e16abba16d88acd342779a8216dd64d60955)
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Window.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index ec9e4323ffe2..ed3ef2bce8e2 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -58,15 +58,16 @@ #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/awt/Rectangle.hpp> +#include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> #include <toolkit/awt/vclxmenu.hxx> +#include <sfx2/viewsh.hxx> #include <svx/svxids.hrc> #include <svx/ActionDescriptionProvider.hxx> - #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> #include <svx/svddrgmt.hxx> @@ -1253,6 +1254,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) if ( !xPopupController.is() || !xPopupMenu.is() ) return; + if (comphelper::LibreOfficeKit::isActive()) + { + PopupMenu* pPopupMenu = static_cast<PopupMenu*>(VCLXMenu::GetImplementation(xPopupMenu)->GetMenu()); + pPopupMenu->SetLOKNotifier(SfxViewShell::Current()); + } + xPopupController->setPopupMenu( xPopupMenu ); xPopupMenu->execute( css::uno::Reference< css::awt::XWindowPeer >( m_xFrame->getContainerWindow(), css::uno::UNO_QUERY ), css::awt::Rectangle( aPos.X(), aPos.Y(), 0, 0 ), |