diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-02 16:30:36 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2020-08-03 09:57:21 +0200 |
| commit | e88cf047c70cedd6ac3553258d4d33bee878a1e6 (patch) | |
| tree | be5694a31d678c8c7c14687759c6d89e83be4299 /sw | |
| parent | 456d61ec526e250fd1af894e109d5914ac9c9e6e (diff) | |
Fix radio buttons in context menus for non-gtk3
The vcl implementation expects menu item attributes to be
set on the sub menu they appear in, not on the parent menu.
Change-Id: I7d6553126ed1dd5c1434529342b776aee01409a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99954
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/inc/redlndlg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 910f23ce2d3d..d35ce818709f 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -74,7 +74,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg final bool m_bInhibitActivate; std::unique_ptr<SvxAcceptChgCtr> m_xTabPagesCTRL; - std::unique_ptr<weld::Menu> m_xPopup; + std::unique_ptr<weld::Menu> m_xPopup, m_xSortMenu; SvxTPView* m_pTPView; SvxRedlinTable* m_pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 1e0c58acd02f..4f242e273af6 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -149,6 +149,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(const std::shared_ptr<weld::Window>& rPar , m_bInhibitActivate(false) , m_xTabPagesCTRL(new SvxAcceptChgCtr(pContentArea, m_xParentDlg.get(), pBuilder)) , m_xPopup(pBuilder->weld_menu("writermenu")) + , m_xSortMenu(pBuilder->weld_menu("writersortmenu")) { m_xTabPagesCTRL->set_help_id(HID_REDLINE_CTRL); m_pTPView = m_xTabPagesCTRL->GetViewPage(); @@ -1028,7 +1029,7 @@ IMPL_LINK(SwRedlineAcceptDlg, CommandHdl, const CommandEvent&, rCEvt, bool) if (nColumn == -1) nColumn = 4; for (sal_Int32 i = 0; i < 5; ++i) - m_xPopup->set_active("writersort" + OString::number(i), i == nColumn); + m_xSortMenu->set_active("writersort" + OString::number(i), i == nColumn); OString sCommand = m_xPopup->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))); |