[Libreoffice-commits] core.git: cui/source

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx |    5 ++---
 cui/source/inc/acccfg.hxx       |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 3de15e365d120c92147f79dab082cca395abf75e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 19 15:05:33 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 19 21:35:46 2021 +0200

    use toggle instead of click for RadioButton
    
    only listen for one toggle for the button grouping
    
    Change-Id: I937331aebc2391e4026f69f16f9c7c9216981d0a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115817
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 8070e0716faf..4666aeac49ce 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -863,8 +863,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage,
     m_xLoadButton->connect_clicked(LINK(this, SfxAcceleratorConfigPage, Load));
     m_xSaveButton->connect_clicked(LINK(this, SfxAcceleratorConfigPage, Save));
     m_xResetButton->connect_clicked(LINK(this, SfxAcceleratorConfigPage, Default));
-    m_xOfficeButton->connect_clicked(LINK(this, SfxAcceleratorConfigPage, RadioHdl));
-    m_xModuleButton->connect_clicked(LINK(this, SfxAcceleratorConfigPage, RadioHdl));
+    m_xOfficeButton->connect_toggled(LINK(this, SfxAcceleratorConfigPage, RadioHdl));
     m_xSearchEdit->connect_changed(LINK(this, SfxAcceleratorConfigPage, SearchUpdateHdl));
     m_xSearchEdit->connect_focus_out(LINK(this, SfxAcceleratorConfigPage, FocusOut_Impl));
 
@@ -1254,7 +1253,7 @@ IMPL_LINK(SfxAcceleratorConfigPage, SelectHdl, weld::TreeView&, rListBox, void)
     }
 }
 
-IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, weld::ToggleButton&, void)
 {
     uno::Reference<ui::XAcceleratorConfiguration> xOld = m_xAct;
 
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index aecc923adec2..f4b72bed8585 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -122,7 +122,7 @@ private:
     DECL_LINK(Save, weld::Button&, void);
     DECL_LINK(Load, weld::Button&, void);
     DECL_LINK(Default, weld::Button&, void);
-    DECL_LINK(RadioHdl, weld::Button&, void);
+    DECL_LINK(RadioHdl, weld::ToggleButton&, void);
     DECL_LINK(ImplUpdateDataHdl, Timer*, void);
     DECL_LINK(FocusOut_Impl, weld::Widget&, void);
     DECL_LINK(TimeOut_Impl, Timer*, void);