[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - chart2/source

[Pranav Kant]

 chart2/source/controller/main/ChartController_Window.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 60edca8d8a9f00d3220255324d30ae41464a4e82
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Mar 15 16:48:18 2018 +0530

    chart2 lok: tunnel context menu of the chart edit view
    
    Change-Id: I0c8b3cfe1666ad81f808871a87e4b0fa64ef593c
    Reviewed-on: https://gerrit.libreoffice.org/51355
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 2989e32d4faa..58f7206554ec 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -55,14 +55,16 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
+
+#include <comphelper/lok.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/propertyvalue.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>
@@ -1232,6 +1234,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 ),