chart2/source/controller/main/ChartController_Window.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit eb76e16abba16d88acd342779a8216dd64d60955
Author: Pranav Kant <pran...@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/51345
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: pranavk <pran...@collabora.co.uk>
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index e3df574732de..83dfc4a1a0c0 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 ),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
