cui/source/dialogs/hangulhanjadlg.cxx | 18 +++++++++---------
cui/source/factory/dlgfact.cxx | 2 +-
cui/source/factory/dlgfact.hxx | 2 +-
cui/source/inc/hangulhanjadlg.hxx | 2 +-
editeng/source/misc/hangulhanja.cxx | 4 ++--
include/editeng/edtdlg.hxx | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit f180554caf7d6088d3fc0da805f5c195f8972e6b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu May 20 10:28:33 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 20 15:31:55 2021 +0200
use toggle instead of click for RadioButton
Change-Id: I2a01d78e2e98b35d2cd24dd7d7d2efda41e35ca8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115863
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 9ec24c5cb72e..713001004091 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -201,7 +201,7 @@ namespace svx
void set_active(bool active) { m_xControl->set_active(active); }
bool get_active() const { return m_xControl->get_active(); }
- void connect_clicked(const Link<weld::Button&, void>& rLink) {
m_xControl->connect_clicked(rLink); }
+ void connect_toggled(const Link<weld::ToggleButton&, void>& rLink) {
m_xControl->connect_toggled(rLink); }
private:
Size GetOptimalSize() const;
@@ -517,15 +517,15 @@ namespace svx
m_xFind->connect_clicked(rHdl);
}
- void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const
Link<weld::Button&,void>& rHdl )
+ void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const
Link<weld::ToggleButton&,void>& rHdl )
{
- m_xSimpleConversion->connect_clicked( rHdl );
- m_xHangulBracketed->connect_clicked( rHdl );
- m_xHanjaBracketed->connect_clicked( rHdl );
- m_xHanjaAbove->connect_clicked( rHdl );
- m_xHanjaBelow->connect_clicked( rHdl );
- m_xHangulAbove->connect_clicked( rHdl );
- m_xHangulBelow->connect_clicked( rHdl );
+ m_xSimpleConversion->connect_toggled( rHdl );
+ m_xHangulBracketed->connect_toggled( rHdl );
+ m_xHanjaBracketed->connect_toggled( rHdl );
+ m_xHanjaAbove->connect_toggled( rHdl );
+ m_xHanjaBelow->connect_toggled( rHdl );
+ m_xHangulAbove->connect_toggled( rHdl );
+ m_xHangulBelow->connect_toggled( rHdl );
}
void HangulHanjaConversionDialog::SetClickByCharacterHdl( const
Link<weld::ToggleButton&,void>& _rHdl )
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 6d0e9e31f77f..52ab08fb3a42 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -463,7 +463,7 @@ void
AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Lin
m_xDlg->SetClickByCharacterHdl(_rHdl );
}
-void
AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const
Link<weld::Button&,void>& rHdl)
+void
AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const
Link<weld::ToggleButton&,void>& rHdl)
{
m_xDlg->SetConversionFormatChangedHdl(rHdl);
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 1678d3c6349b..452bd08feba4 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -193,7 +193,7 @@ public:
virtual void SetChangeHdl( const Link<weld::Button&,void>& _rHdl )
override ;
virtual void SetChangeAllHdl( const Link<weld::Button&,void>& rHdl )
override ;
virtual void SetClickByCharacterHdl( const
Link<weld::ToggleButton&,void>& rHdl ) override ;
- virtual void SetConversionFormatChangedHdl( const
Link<weld::Button&,void>& _rHdl ) override ;
+ virtual void SetConversionFormatChangedHdl( const
Link<weld::ToggleButton&,void>& _rHdl ) override ;
virtual void SetFindHdl( const Link<weld::Button&,void>& _rHdl )
override;
virtual bool GetUseBothDirections( ) const override;
virtual editeng::HangulHanjaConversion::ConversionDirection
diff --git a/cui/source/inc/hangulhanjadlg.hxx
b/cui/source/inc/hangulhanjadlg.hxx
index 716efa0827b8..f1344c800157 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -129,7 +129,7 @@ namespace svx
void SetChangeAllHdl( const Link<weld::Button&,void>& _rHdl );
void SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>&
_rHdl );
- void SetConversionFormatChangedHdl( const Link<weld::Button&,void>&
_rHdl );
+ void SetConversionFormatChangedHdl( const
Link<weld::ToggleButton&,void>& _rHdl );
void SetFindHdl( const Link<weld::Button&,void>& _rHdl );
OUString GetCurrentString( ) const;
diff --git a/editeng/source/misc/hangulhanja.cxx
b/editeng/source/misc/hangulhanja.cxx
index 1b4911d4ccd4..839943e86e72 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -154,7 +154,7 @@ namespace editeng
DECL_LINK( OnChange, weld::Button&, void );
DECL_LINK( OnChangeAll, weld::Button&, void );
DECL_LINK( OnByCharClicked, weld::ToggleButton&, void );
- DECL_LINK( OnConversionTypeChanged, weld::Button&, void );
+ DECL_LINK( OnConversionTypeChanged, weld::ToggleButton&, void );
DECL_LINK( OnFind, weld::Button&, void );
/** proceed, after the current convertible has been handled
@@ -868,7 +868,7 @@ namespace editeng
implProceed( true );
}
- IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged,
weld::Button&, void)
+ IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged,
weld::ToggleButton&, void)
{
DBG_ASSERT( m_pConversionDialog, "we should always have a dialog
here!" );
if( m_pConversionDialog )
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 15b591a41ff9..84e5b6edc03d 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -72,7 +72,7 @@ public:
virtual void SetChangeHdl( const Link<weld::Button&,void>& _rHdl ) = 0;
virtual void SetChangeAllHdl( const Link<weld::Button&,void>& _rHdl )
= 0;
virtual void SetClickByCharacterHdl( const
Link<weld::ToggleButton&,void>& _rHdl ) = 0;
- virtual void SetConversionFormatChangedHdl( const
Link<weld::Button&,void>& _rHdl ) = 0;
+ virtual void SetConversionFormatChangedHdl( const
Link<weld::ToggleButton&,void>& _rHdl ) = 0;
virtual void SetFindHdl( const Link<weld::Button&,void>& _rHdl ) = 0;
virtual bool GetUseBothDirections() const= 0;
virtual editeng::HangulHanjaConversion::ConversionDirection
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
