From 12f5b4b3830ecfcaa8d3f01ed5e73da15e1caaf2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 15 Dec 2020 09:32:26 +0000 Subject: use GetParentWithLOKNotifier to get the frame LOKNotifier to reuse for menus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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 Tested-by: pranavk Reviewed-on: https://gerrit.libreoffice.org/51166 Tested-by: Jenkins Reviewed-by: Jan Holesovsky SetLOKNotifier in editeng/source/editeng/editview.cxx added with: commit 7c6fbd0ac3b5927b337aa69b132aba14e9b3103f Author: Tamás Zolnai 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 Reviewed-by: Tamás Zolnai Change-Id: I6c23ba4252eab3850b7cc4c8cad2d2f8adee2792 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107747 Tested-by: Jenkins Reviewed-by: Caolán McNamara Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117254 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos --- include/vcl/menu.hxx | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include/vcl') diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 8821e74256a5..47bfa8848c1b 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -500,8 +500,6 @@ class VCL_DLLPUBLIC PopupMenu : public Menu friend struct MenuItemData; private: - const vcl::ILibreOfficeKitNotifier* mpLOKNotifier; ///< To emit the LOK callbacks eg. for dialog tunneling. - SAL_DLLPRIVATE MenuFloatingWindow * ImplGetFloatingWindow() const; protected: @@ -536,12 +534,6 @@ public: static bool IsInExecute(); static PopupMenu* GetActivePopupMenu(); - /// Interface to register for dialog / window tunneling. - void SetLOKNotifier(const vcl::ILibreOfficeKitNotifier* pNotifier) - { - mpLOKNotifier = pNotifier; - } - PopupMenu& operator=( const PopupMenu& rMenu ); }; -- cgit