[Libreoffice-commits] core.git: sc/source svx/uiconfig sw/source

[Maxim Monastirsky (via logerrit)]

 sc/source/ui/inc/acredlin.hxx                |    2 +-
 sc/source/ui/miscdlgs/acredlin.cxx           |    3 ++-
 svx/uiconfig/ui/acceptrejectchangesdialog.ui |    4 ++--
 sw/source/uibase/inc/redlndlg.hxx            |    2 +-
 sw/source/uibase/misc/redlndlg.cxx           |    3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e88cf047c70cedd6ac3553258d4d33bee878a1e6
Author:     Maxim Monastirsky <momonasmon at gmail.com>
AuthorDate: Sun Aug 2 16:30:36 2020 +0300
Commit:     Maxim Monastirsky <momonasmon at gmail.com>
CommitDate: Mon Aug 3 09:57:21 2020 +0200

    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 at gmail.com>

diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 24ac56361a0b..7bca575093d2 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -81,7 +81,7 @@ class ScAcceptChgDlg final : public SfxModelessDialogController
     SvxRedlinTable* pTheView; // #i48648 now SvHeaderTabListBox
 
     std::unique_ptr<weld::Container> m_xContentArea;
-    std::unique_ptr<weld::Menu> m_xPopup;
+    std::unique_ptr<weld::Menu> m_xPopup, m_xSortMenu;
     std::unique_ptr<SvxAcceptChgCtr> m_xAcceptChgCtr;
 
     void            Init();
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index fecbd56db7f5..3ea6c43dc74e 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -98,6 +98,7 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Windo
     , bUseColor(false)
     , m_xContentArea(m_xDialog->weld_content_area())
     , m_xPopup(m_xBuilder->weld_menu("calcmenu"))
+    , m_xSortMenu(m_xBuilder->weld_menu("calcsortmenu"))
 {
     m_xAcceptChgCtr.reset(new SvxAcceptChgCtr(m_xContentArea.get(), m_xDialog.get(), m_xBuilder.get()));
     nAcceptCount=0;
@@ -1611,7 +1612,7 @@ IMPL_LINK(ScAcceptChgDlg, CommandHdl, const CommandEvent&, rCEvt, bool)
 
     int nSortedCol = rTreeView.get_sort_column();
     for (sal_Int32 i = 0; i < 5; ++i)
-        m_xPopup->set_active("calcsort" + OString::number(i), i == nSortedCol);
+        m_xSortMenu->set_active("calcsort" + OString::number(i), i == nSortedCol);
 
     m_xPopup->set_sensitive("calcedit", false);
 
diff --git a/svx/uiconfig/ui/acceptrejectchangesdialog.ui b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
index a9db619b328f..8305b7d90ea9 100644
--- a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
+++ b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
@@ -151,7 +151,7 @@
         <property name="label" translatable="yes" context="acceptrejectchangesdialog|calcsort">Sorting</property>
         <property name="use_underline">True</property>
         <child type="submenu">
-          <object class="GtkMenu">
+          <object class="GtkMenu" id="calcsortmenu">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -220,7 +220,7 @@
         <property name="label" translatable="yes" context="acceptrejectchangesdialog|writersort">Sort By</property>
         <property name="use_underline">True</property>
         <child type="submenu">
-          <object class="GtkMenu">
+          <object class="GtkMenu" id="writersortmenu">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
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)));