diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-15 09:32:26 +0000 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2021-06-18 11:31:19 +0200 |
| commit | 12f5b4b3830ecfcaa8d3f01ed5e73da15e1caaf2 (patch) | |
| tree | e8e397ced3b88ea33f316d0532ddf5270835b6de /editeng | |
| parent | 5bd6b067b1c7f1a1d11627b005c7c1cba8ffabab (diff) | |
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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117254
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editview.cxx | 4 | ||||
| -rw-r--r-- | editeng/uiconfig/ui/spellmenu.ui | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 18ed2f506405..636d2280dd60 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -971,7 +971,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo return; VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), "editeng/ui/spellmenu.ui", ""); - VclPtr<PopupMenu> aPopupMenu(aBuilder.get_menu("menu")); + VclPtr<PopupMenu> aPopupMenu(aBuilder.get_menu("editviewspellmenu")); const sal_uInt16 nAutoCorrId = aPopupMenu->GetItemId("autocorrect"); PopupMenu *pAutoMenu = aPopupMenu->GetPopupMenu(nAutoCorrId); const sal_uInt16 nInsertId = aPopupMenu->GetItemId("insert"); @@ -1156,8 +1156,6 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo LOKSendSpellPopupMenu(aPopupMenu, nGuessLangWord, nGuessLangPara, nWords); return; } - else // For desktop and tablets, we use the tunneled dialog - aPopupMenu->SetLOKNotifier(pViewShell); } sal_uInt16 nId = aPopupMenu->Execute(pImpEditView->GetWindow(), aTempRect, PopupMenuFlags::NoMouseUpClose); diff --git a/editeng/uiconfig/ui/spellmenu.ui b/editeng/uiconfig/ui/spellmenu.ui index d13d54ff04fb..9dd0d595701f 100644 --- a/editeng/uiconfig/ui/spellmenu.ui +++ b/editeng/uiconfig/ui/spellmenu.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.0 --> <interface domain="editeng"> <requires lib="gtk+" version="3.20"/> - <object class="GtkMenu" id="menu"> + <object class="GtkMenu" id="editviewspellmenu"> <property name="visible">True</property> <property name="can_focus">False</property> <child> |