use GetParentWithLOKNotifier to get the frame LOKNotifier to reuse for menus

so it doesn't have to be explicitly set by the editview menu creator

If I force enable LibreOfficeKit::isActive and right click on a
mispelled word in impress, or in the writer comments-in-margin before or
after this change I see the same ILibreOfficeKitNotifier set on the
MenuFloatingWindow. Seeing as this is used in only the editview spell
checking menu give that a unique id 'editviewspellmenu' and only do
this for that id

SetLOKNotifier in vcl/source/window/menu.cxx added with:
commit 8938e8b153f32f3f5926baddb87cb76c8e72755a
Author: Jan Holesovsky <kendy@collabora.com>
Date:   Thu Mar 8 21:07:40 2018 +0100

lokdialog: Tunnel the spell-checking context menu with recommendations.

Change-Id: I1a7952e88a3f89346c97d2516628b4a7a0423de6
Reviewed-on: https://gerrit.libreoffice.org/51062
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
Reviewed-on: https://gerrit.libreoffice.org/51166
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>

SetLOKNotifier in editeng/source/editeng/editview.cxx added with:
commit 7c6fbd0ac3b5927b337aa69b132aba14e9b3103f
Author: Tamás Zolnai <tamas.zolnai@collabora.com>
Date:   Mon Apr 16 14:38:36 2018 +0200

sd lok: Impress: Right-click menu on misspelled word locks up session

Change-Id: Ib554eea7049c1ea244bc4789ee3d7d2adf87e283
Reviewed-on: https://gerrit.libreoffice.org/52977
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>

Change-Id: I6c23ba4252eab3850b7cc4c8cad2d2f8adee2792
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107747
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 5fa5e99e034a..f14056057aa5 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2714,14 +2714,12 @@ MenuFloatingWindow * PopupMenu::ImplGetFloatingWindow() const {
 }
 
 PopupMenu::PopupMenu()
-    : mpLOKNotifier(nullptr)
 {
     mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
 }
 
 PopupMenu::PopupMenu( const PopupMenu& rMenu )
-    : Menu(),
-      mpLOKNotifier(nullptr)
+    : Menu()
 {
     mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
     *this = rMenu;
@@ -2922,8 +2920,12 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const tools::R
     }
 
     VclPtrInstance<MenuFloatingWindow> pWin( this, pW, WB_BORDER | WB_SYSTEMWINDOW );
-    if (comphelper::LibreOfficeKit::isActive() && mpLOKNotifier)
-        pWin->SetLOKNotifier(mpLOKNotifier);
+    if (comphelper::LibreOfficeKit::isActive() && get_id() == "editviewspellmenu")
+    {
+        VclPtr<vcl::Window> xNotifierParent = pW->GetParentWithLOKNotifier();
+        assert(xNotifierParent && xNotifierParent->GetLOKNotifier() && "editview menu without LOKNotifier");
+        pWin->SetLOKNotifier(xNotifierParent->GetLOKNotifier());
+    }
 
     if( pSVData->maNWFData.mbFlatMenu )
         pWin->SetBorderStyle( WindowBorderStyle::NOBORDER );