sc/source/ui/dbgui/scuiasciiopt.cxx | 24 ++++++++++++------------ sc/source/ui/dbgui/tpsubt.cxx | 10 +++++----- sc/source/ui/inc/delcodlg.hxx | 2 +- sc/source/ui/inc/linkarea.hxx | 2 +- sc/source/ui/inc/mtrindlg.hxx | 2 +- sc/source/ui/inc/scuiasciiopt.hxx | 2 +- sc/source/ui/inc/tpsubt.hxx | 4 ++-- sc/source/ui/miscdlgs/delcodlg.cxx | 4 ++-- sc/source/ui/miscdlgs/linkarea.cxx | 4 ++-- sc/source/ui/miscdlgs/mtrindlg.cxx | 4 ++-- sd/source/filter/html/pubdlg.cxx | 4 ++-- sd/source/ui/inc/pubdlg.hxx | 2 +- sw/source/ui/config/optpage.cxx | 32 ++++++++++++++++---------------- sw/source/ui/misc/linenum.cxx | 4 ++-- sw/source/uibase/inc/linenum.hxx | 2 +- sw/source/uibase/inc/optpage.hxx | 4 ++-- 16 files changed, 53 insertions(+), 53 deletions(-)
New commits: commit 48182506886230a70cfa2ce3c61470701cb1138e Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu May 20 13:00:44 2021 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu May 20 17:01:53 2021 +0200 use toggle instead of click for CheckButton Change-Id: Ic8957a59addbf08f2b2e4e84167991f00048c6a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115876 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 40d86b908de0..34cedba0824c 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -431,18 +431,18 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa lcl_FillCombo( *mxCbTextSep, gaTextSepList, mcTextSep ); mxCbTextSep->set_entry_text(sTextSeparators); - Link<weld::Button&,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); + Link<weld::ToggleButton&,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg, SeparatorComboBoxHdl ) ); - mxCkbTab->connect_clicked( aSeparatorClickHdl ); - mxCkbSemicolon->connect_clicked( aSeparatorClickHdl ); - mxCkbComma->connect_clicked( aSeparatorClickHdl ); - mxCkbAsOnce->connect_clicked( aSeparatorClickHdl ); - mxCkbQuotedAsText->connect_clicked( aSeparatorClickHdl ); - mxCkbDetectNumber->connect_clicked( aSeparatorClickHdl ); - mxCkbSkipEmptyCells->connect_clicked( aSeparatorClickHdl ); - mxCkbSpace->connect_clicked( aSeparatorClickHdl ); - mxCkbRemoveSpace->connect_clicked( aSeparatorClickHdl ); - mxCkbOther->connect_clicked( aSeparatorClickHdl ); + mxCkbTab->connect_toggled( aSeparatorClickHdl ); + mxCkbSemicolon->connect_toggled( aSeparatorClickHdl ); + mxCkbComma->connect_toggled( aSeparatorClickHdl ); + mxCkbAsOnce->connect_toggled( aSeparatorClickHdl ); + mxCkbQuotedAsText->connect_toggled( aSeparatorClickHdl ); + mxCkbDetectNumber->connect_toggled( aSeparatorClickHdl ); + mxCkbSkipEmptyCells->connect_toggled( aSeparatorClickHdl ); + mxCkbSpace->connect_toggled( aSeparatorClickHdl ); + mxCkbRemoveSpace->connect_toggled( aSeparatorClickHdl ); + mxCkbOther->connect_toggled( aSeparatorClickHdl ); mxEdOther->connect_changed(LINK(this, ScImportAsciiDlg, SeparatorEditHdl)); // *** text encoding ListBox *** @@ -709,7 +709,7 @@ IMPL_LINK(ScImportAsciiDlg, RbSepFixHdl, weld::Button&, rButton, void) } } -IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::Button&, rCtrl, void) +IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::ToggleButton&, rCtrl, void) { SeparatorHdl(&rCtrl); } diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 9ece3597bb50..57b34a9b09f9 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -82,7 +82,7 @@ void ScTpSubTotalGroup::Init() mxLbColumns->connect_changed( LINK( this, ScTpSubTotalGroup, SelectTreeListBoxHdl ) ); mxLbColumns->connect_toggled( LINK( this, ScTpSubTotalGroup, CheckHdl ) ); mxLbFunctions->connect_changed( LINK( this, ScTpSubTotalGroup, SelectTreeListBoxHdl) ); - mxLbSelectAllColumns->connect_clicked( LINK( this, ScTpSubTotalGroup, CheckBoxHdl ) ); + mxLbSelectAllColumns->connect_toggled( LINK( this, ScTpSubTotalGroup, CheckBoxHdl ) ); mnFieldArr.resize(SC_MAXFIELDS(pDoc->GetSheetLimits())); mnFieldArr[0] = 0; @@ -470,8 +470,8 @@ void ScTpSubTotalOptions::Init() pDoc = &pViewData->GetDocument(); assert(pDoc && "Document not found!"); - m_xBtnSort->connect_clicked( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); - m_xBtnUserDef->connect_clicked( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + m_xBtnSort->connect_toggled( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + m_xBtnUserDef->connect_toggled( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); FillUserSortListBox(); } @@ -551,7 +551,7 @@ void ScTpSubTotalOptions::FillUserSortListBox() // Handler: -IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::Button&, rBox, void) +IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::ToggleButton&, rBox, void) { if (&rBox == m_xBtnSort.get()) { @@ -588,7 +588,7 @@ IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::Button&, rBox, void) } } -IMPL_LINK(ScTpSubTotalGroup, CheckBoxHdl, weld::Button&, rBox, void) +IMPL_LINK(ScTpSubTotalGroup, CheckBoxHdl, weld::ToggleButton&, rBox, void) { if (&rBox != mxLbSelectAllColumns.get()) return; diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 984f957852bd..db3f6bd5cccb 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -41,7 +41,7 @@ private: static InsertDeleteFlags nPreviousChecks; void DisableChecks(bool bDelAllChecked); - DECL_LINK(DelAllHdl, weld::Button&, void); + DECL_LINK(DelAllHdl, weld::ToggleButton&, void); public: ScDeleteContentsDlg(weld::Window* pParent); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 16af8aff4dd7..02e022196d2e 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -47,7 +47,7 @@ private: DECL_LINK(FileHdl, weld::ComboBox&, bool); DECL_LINK(BrowseHdl, weld::Button&, void); DECL_LINK(RangeHdl, weld::TreeView&, void); - DECL_LINK(ReloadHdl, weld::Button&, void); + DECL_LINK(ReloadHdl, weld::ToggleButton&, void); DECL_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); void UpdateSourceRanges(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index d140f9f3a02c..823aa3cd77bd 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -42,7 +42,7 @@ private: int nDefaultValue; int nCurrentValue; - DECL_LINK(SetDefValHdl, weld::Button&, void); + DECL_LINK(SetDefValHdl, weld::ToggleButton&, void); DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); }; diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index cde26d7df023..a522a50c81b2 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -107,7 +107,7 @@ private: DECL_LINK( FirstRowHdl, weld::SpinButton&, void ); DECL_LINK( RbSepFixHdl, weld::Button&, void ); DECL_LINK( SeparatorEditHdl, weld::Entry&, void ); - DECL_LINK( SeparatorClickHdl, weld::Button&, void ); + DECL_LINK( SeparatorClickHdl, weld::ToggleButton&, void ); DECL_LINK( SeparatorComboBoxHdl, weld::ComboBox&, void ); void SeparatorHdl(const weld::Widget*); DECL_LINK( LbColTypeHdl, weld::ComboBox&, void ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index e7bbd2732fc3..4edaddc24f61 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -67,7 +67,7 @@ private: DECL_LINK( SelectListBoxHdl, weld::ComboBox&, void ); DECL_LINK( SelectTreeListBoxHdl, weld::TreeView&, void ); DECL_LINK(CheckHdl, const weld::TreeView::iter_col&, void); - DECL_LINK(CheckBoxHdl, weld::Button&, void); + DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); void SelectHdl(const weld::Widget*); }; @@ -126,7 +126,7 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK(CheckHdl, weld::Button&, void); + DECL_LINK(CheckHdl, weld::ToggleButton&, void); ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index e6e6d3389356..0caa9075c9f6 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -50,7 +50,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg(weld::Window* pParent) DisableChecks( m_xBtnDelAll->get_active() ); - m_xBtnDelAll->connect_clicked( LINK( this, ScDeleteContentsDlg, DelAllHdl ) ); + m_xBtnDelAll->connect_toggled( LINK( this, ScDeleteContentsDlg, DelAllHdl ) ); } ScDeleteContentsDlg::~ScDeleteContentsDlg() @@ -117,7 +117,7 @@ void ScDeleteContentsDlg::DisableObjects() m_xBtnDelObjects->set_sensitive(false); } -IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, weld::Button&, void) +IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, weld::ToggleButton&, void) { DisableChecks( m_xBtnDelAll->get_active() ); } diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index b8bc66c8d2a9..a8887a301855 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -53,7 +53,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg(weld::Widget* pParent) m_xLbRanges->connect_changed(LINK( this, ScLinkedAreaDlg, RangeHdl)); m_xLbRanges->set_size_request(m_xLbRanges->get_approximate_digit_width() * 54, m_xLbRanges->get_height_rows(5)); - m_xBtnReload->connect_clicked(LINK( this, ScLinkedAreaDlg, ReloadHdl)); + m_xBtnReload->connect_toggled(LINK( this, ScLinkedAreaDlg, ReloadHdl)); UpdateEnable(); } @@ -173,7 +173,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl, weld::TreeView&, void) UpdateEnable(); } -IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, weld::Button&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, weld::ToggleButton&, void) { UpdateEnable(); } diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index b7b3a43beb59..69a728068916 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -35,7 +35,7 @@ ScMetricInputDlg::ScMetricInputDlg( weld::Window* pParent, , m_xEdValue(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM)) , m_xBtnDefVal(m_xBuilder->weld_check_button("default")) { - m_xBtnDefVal->connect_clicked(LINK(this, ScMetricInputDlg, SetDefValHdl)); + m_xBtnDefVal->connect_toggled(LINK(this, ScMetricInputDlg, SetDefValHdl)); m_xEdValue->connect_value_changed(LINK( this, ScMetricInputDlg, ModifyHdl)); m_xEdValue->set_unit(eFUnit); @@ -85,7 +85,7 @@ int ScMetricInputDlg::GetInputValue() const // Handler: -IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, weld::Button&, void) +IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, weld::ToggleButton&, void) { if (m_xBtnDefVal->get_active()) { diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index f156df7d32b6..845139acbd72 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -415,7 +415,7 @@ SdPublishingDlg::SdPublishingDlg(weld::Window* pWindow, DocumentType eDocType) m_xPage2_Kiosk->connect_clicked(LINK(this,SdPublishingDlg,BaseHdl)); m_xPage2_WebCast->connect_clicked(LINK(this,SdPublishingDlg,BaseHdl)); - m_xPage2_Content->connect_clicked(LINK(this,SdPublishingDlg,ContentHdl)); + m_xPage2_Content->connect_toggled(LINK(this,SdPublishingDlg,ContentHdl)); m_xPage2_ASP->connect_clicked(LINK(this,SdPublishingDlg,WebServerHdl)); m_xPage2_PERL->connect_clicked(LINK(this,SdPublishingDlg,WebServerHdl)); @@ -926,7 +926,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl, weld::Button&, void) } // Clickhandler for the Checkbox of the Title page -IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, weld::Button&, void) +IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, weld::ToggleButton&, void) { if(m_xPage2_Content->get_active()) { diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 5c8f15d629d0..042d6d728c55 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -187,7 +187,7 @@ private: DECL_LINK(DesignSelectHdl, weld::TreeView&, void); DECL_LINK(DesignDeleteHdl, weld::Button&, void); DECL_LINK(BaseHdl, weld::Button&, void); - DECL_LINK(ContentHdl, weld::Button&, void); + DECL_LINK(ContentHdl, weld::ToggleButton&, void); DECL_LINK(GfxFormatHdl, weld::Button&, void); DECL_LINK(ResolutionHdl, weld::Button&, void); DECL_LINK(ButtonsHdl, ValueSet*, void); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5db1c92b304c..8b2352350a31 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2022,7 +2022,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage(weld::Container* pPage, weld::D m_xWordRB->connect_clicked( aLnk ); m_xCharRB->connect_clicked( aLnk ); - m_xIgnoreCB->connect_clicked( LINK( this, SwCompareOptionsTabPage, IgnoreHdl) ); + m_xIgnoreCB->connect_toggled( LINK( this, SwCompareOptionsTabPage, IgnoreHdl) ); } SwCompareOptionsTabPage::~SwCompareOptionsTabPage() @@ -2133,7 +2133,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, ComparisonHdl, weld::Button&, void) m_xLenNF->set_sensitive( bChecked && m_xIgnoreCB->get_active() ); } -IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::Button&, void) +IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::ToggleButton&, void) { m_xLenNF->set_sensitive(m_xIgnoreCB->get_active()); } @@ -2212,20 +2212,20 @@ void SwTestTabPage::Reset( const SfxItemSet* ) void SwTestTabPage::Init() { // handler - Link<weld::Button&,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl ); - m_xTest1CBox->connect_clicked( aLk ); - m_xTest2CBox->connect_clicked( aLk ); - m_xTest3CBox->connect_clicked( aLk ); - m_xTest4CBox->connect_clicked( aLk ); - m_xTest5CBox->connect_clicked( aLk ); - m_xTest6CBox->connect_clicked( aLk ); - m_xTest7CBox->connect_clicked( aLk ); - m_xTest8CBox->connect_clicked( aLk ); - m_xTest9CBox->connect_clicked( aLk ); - m_xTest10CBox->connect_clicked( aLk ); -} - -IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, weld::Button&, void) + Link<weld::ToggleButton&,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl ); + m_xTest1CBox->connect_toggled( aLk ); + m_xTest2CBox->connect_toggled( aLk ); + m_xTest3CBox->connect_toggled( aLk ); + m_xTest4CBox->connect_toggled( aLk ); + m_xTest5CBox->connect_toggled( aLk ); + m_xTest6CBox->connect_toggled( aLk ); + m_xTest7CBox->connect_toggled( aLk ); + m_xTest8CBox->connect_toggled( aLk ); + m_xTest9CBox->connect_toggled( aLk ); + m_xTest10CBox->connect_toggled( aLk ); +} + +IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, weld::ToggleButton&, void) { bAttrModified = true; } diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 34a913181350..ec107202aba0 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -166,7 +166,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(const SwView& rVw) } // Line Numbering - m_xNumberingOnCB->connect_clicked(LINK(this, SwLineNumberingDlg, LineOnOffHdl)); + m_xNumberingOnCB->connect_toggled(LINK(this, SwLineNumberingDlg, LineOnOffHdl)); m_xDivisorED->connect_changed(LINK(this, SwLineNumberingDlg, ModifyHdl)); ModifyHdl(*m_xDivisorED); LineOnOffHdl(*m_xNumberingOnCB); @@ -250,7 +250,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl, weld::Entry&, void) } // On/Off -IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, weld::Button&, void) +IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, weld::ToggleButton&, void) { bool bEnable = m_xNumberingOnCB->get_active(); m_xBodyContent->set_sensitive(bEnable); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 21f4d78864ca..c05a8fe7d61c 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -48,7 +48,7 @@ private: std::unique_ptr<weld::Widget> m_xNumIntervalFT; std::unique_ptr<weld::Widget> m_xNumRowsFT; DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(LineOnOffHdl, weld::Button&, void); + DECL_LINK(LineOnOffHdl, weld::ToggleButton&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); public: diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index ead7dbc40675..832fd87b0733 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -362,7 +362,7 @@ private: std::unique_ptr<weld::CheckButton> m_xTest10CBox; void Init(); - DECL_LINK(AutoClickHdl, weld::Button&, void); + DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); }; #endif // DBG_UTIL @@ -377,7 +377,7 @@ class SwCompareOptionsTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xStoreRsidCB; DECL_LINK(ComparisonHdl, weld::Button&, void); - DECL_LINK(IgnoreHdl, weld::Button&, void); + DECL_LINK(IgnoreHdl, weld::ToggleButton&, void); public: SwCompareOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits