svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 5
++---
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 2 +-
sw/source/ui/config/mailconfigpage.cxx | 8
+++-----
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit a69cc693fee8581d1612e79be13e0234ad72cd6e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 19 20:55:17 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 20 10:43:43 2021 +0200
use toggle instead of click for RadioButton
only listen for one toggle for the button grouping
Change-Id: Ie977045288906791319d7df30b3d7737253e3671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115828
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 33b8c27fa913..5a693a90cc76 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -391,8 +391,7 @@
ChineseDictionaryDialog::ChineseDictionaryDialog(weld::Window* pParent)
m_xED_Mapping->connect_changed( LINK( this, ChineseDictionaryDialog,
EditFieldsHdl ) );
m_xLB_Property->connect_changed( LINK( this, ChineseDictionaryDialog,
EditFieldsListBoxHdl ) );
- m_xRB_To_Simplified->connect_clicked( LINK( this, ChineseDictionaryDialog,
DirectionHdl ) );
- m_xRB_To_Traditional->connect_clicked( LINK( this,
ChineseDictionaryDialog, DirectionHdl ) );
+ m_xRB_To_Simplified->connect_toggled( LINK( this, ChineseDictionaryDialog,
DirectionHdl ) );
m_xCT_DictionaryToSimplified->connect_changed( LINK( this,
ChineseDictionaryDialog, MappingSelectHdl ));
m_xCT_DictionaryToTraditional->connect_changed( LINK( this,
ChineseDictionaryDialog, MappingSelectHdl ));
@@ -424,7 +423,7 @@ void
ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect
updateAfterDirectionChange();
}
-IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, weld::Button&, void)
+IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, weld::ToggleButton&,
void)
{
updateAfterDirectionChange();
}
diff --git
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index ee179dd92e58..f333545e479f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -108,7 +108,7 @@ public:
virtual short run() override;
private:
- DECL_LINK( DirectionHdl, weld::Button&, void );
+ DECL_LINK( DirectionHdl, weld::ToggleButton&, void );
DECL_LINK( EditFieldsHdl, weld::Entry&, void );
DECL_LINK( EditFieldsListBoxHdl, weld::ComboBox&, void );
DECL_LINK( MappingSelectHdl, weld::TreeView&, void );
diff --git a/sw/source/ui/config/mailconfigpage.cxx
b/sw/source/ui/config/mailconfigpage.cxx
index e51d301951af..81bebf9c0253 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -94,7 +94,7 @@ class SwAuthenticationSettingsDialog : public
SfxDialogController
DECL_LINK(OKHdl_Impl, weld::Button&, void);
DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(RadioButtonHdl_Impl, weld::ToggleButton&, void);
- DECL_LINK(InServerHdl_Impl, weld::Button&, void);
+ DECL_LINK(InServerHdl_Impl, weld::ToggleButton&, void);
public:
SwAuthenticationSettingsDialog(weld::Window* pParent,
SwMailMergeConfigItem& rItem);
@@ -391,9 +391,7 @@
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
m_xSeparateAuthenticationRB->connect_toggled( aRBLink );
m_xSMTPAfterPOPRB->connect_toggled( aRBLink );
m_xOKPB->connect_clicked( LINK( this, SwAuthenticationSettingsDialog,
OKHdl_Impl));
- Link<weld::Button&,void> aInServerLink = LINK( this,
SwAuthenticationSettingsDialog, InServerHdl_Impl );
- m_xPOP3RB->connect_clicked( aInServerLink );
- m_xIMAPRB->connect_clicked( aInServerLink );
+ m_xPOP3RB->connect_toggled(LINK(this, SwAuthenticationSettingsDialog,
InServerHdl_Impl));
m_xAuthenticationCB->set_active(m_rConfigItem.IsAuthentication());
if (m_rConfigItem.IsSMTPAfterPOP())
@@ -474,7 +472,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog,
RadioButtonHdl_Impl, weld::Toggl
m_xInPasswordED->set_sensitive(bNotSeparate);
}
-IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl,
weld::Button&, void)
+IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl,
weld::ToggleButton&, void)
{
bool bPOP = m_xPOP3RB->get_active();
m_rConfigItem.SetInServerPOP(bPOP);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
