cui/source/dialogs/hlinettp.cxx | 4 +--
cui/source/dialogs/passwdomdlg.cxx | 4 +--
cui/source/inc/hlinettp.hxx | 2 -
cui/source/inc/passwdomdlg.hxx | 2 -
dbaccess/source/ui/dlg/adtabdlg.cxx | 5 +---
dbaccess/source/ui/dlg/detailpages.cxx | 25 ++++++++++------------
dbaccess/source/ui/dlg/detailpages.hxx | 1
dbaccess/source/ui/dlg/indexdialog.cxx | 4 +--
dbaccess/source/ui/inc/WCPage.hxx | 2 -
dbaccess/source/ui/inc/adtabdlg.hxx | 2 -
dbaccess/source/ui/inc/indexdialog.hxx | 2 -
dbaccess/source/ui/misc/WCPage.cxx | 4 +--
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 6 ++---
sc/source/ui/dbgui/filtdlg.cxx | 6 ++---
sc/source/ui/dbgui/validate.cxx | 4 +--
sc/source/ui/inc/SamplingDialog.hxx | 2 -
sc/source/ui/inc/filtdlg.hxx | 2 -
sc/source/ui/inc/highred.hxx | 2 -
sc/source/ui/inc/validate.hxx | 2 -
sc/source/ui/miscdlgs/highred.cxx | 4 +--
sw/source/ui/config/optload.cxx | 5 +---
sw/source/uibase/inc/optload.hxx | 2 -
22 files changed, 45 insertions(+), 47 deletions(-)
New commits:
commit 6815067b75ab79c050d07693a9a1b7e306a4af1b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 19 15:16:47 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 19 21:36:02 2021 +0200
use toggle instead of click for RadioButton
only listen for one toggle for the button grouping
Change-Id: I0c1866c25793ffce50bcf5f5a07fcdc98f64aacc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 86a3da492a69..5ee2aa70f90f 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -70,7 +70,7 @@
SvxHyperlinkInternetTp::SvxHyperlinkInternetTp(weld::Container* pParent,
Link<weld::Button&, void> aLink( LINK ( this, SvxHyperlinkInternetTp,
Click_SmartProtocol_Impl ) );
m_xRbtLinktypInternet->connect_clicked( aLink );
m_xRbtLinktypFTP->connect_clicked( aLink );
- m_xCbAnonymous->connect_clicked( LINK ( this, SvxHyperlinkInternetTp,
ClickAnonymousHdl_Impl ) );
+ m_xCbAnonymous->connect_toggled( LINK ( this, SvxHyperlinkInternetTp,
ClickAnonymousHdl_Impl ) );
m_xEdLogin->connect_changed( LINK ( this, SvxHyperlinkInternetTp,
ModifiedLoginHdl_Impl ) );
m_xCbbTarget->connect_focus_out( LINK ( this, SvxHyperlinkInternetTp,
LostFocusTargetHdl_Impl ) );
m_xCbbTarget->connect_changed( LINK ( this, SvxHyperlinkInternetTp,
ModifiedTargetHdl_Impl ) );
@@ -325,7 +325,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp,
Click_SmartProtocol_Impl, weld::Button&,
|* Click on Checkbox : Anonymous user
|*
|************************************************************************/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, weld::Button&,
void)
+IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl,
weld::ToggleButton&, void)
{
// disable login-editfields if checked
if ( m_xCbAnonymous->get_active() )
diff --git a/cui/source/dialogs/passwdomdlg.cxx
b/cui/source/dialogs/passwdomdlg.cxx
index 9c06e961498e..9f7986482596 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -132,7 +132,7 @@
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, s
if (!bIsPasswordToModify)
m_xOptionsExpander->hide();
- m_xOpenReadonlyCB->connect_clicked(LINK(this, PasswordToOpenModifyDialog,
ReadonlyOnOffHdl));
+ m_xOpenReadonlyCB->connect_toggled(LINK(this, PasswordToOpenModifyDialog,
ReadonlyOnOffHdl));
ReadonlyOnOffHdl(*m_xOpenReadonlyCB);
}
@@ -159,7 +159,7 @@ bool
PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const
return m_xOpenReadonlyCB->get_active();
}
-IMPL_LINK_NOARG(PasswordToOpenModifyDialog, ReadonlyOnOffHdl, weld::Button&,
void)
+IMPL_LINK_NOARG(PasswordToOpenModifyDialog, ReadonlyOnOffHdl,
weld::ToggleButton&, void)
{
bool bEnable = m_xOpenReadonlyCB->get_active();
m_xPasswdToModifyED->set_sensitive(bEnable);
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index c317fc122fd4..ae09e8ac874f 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -46,7 +46,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xCbAnonymous;
DECL_LINK( Click_SmartProtocol_Impl, weld::Button&, void ); ///<
Radiobutton clicked: Type HTTP or FTP
- DECL_LINK( ClickAnonymousHdl_Impl, weld::Button&, void ); ///< Checkbox :
Anonymous User
+ DECL_LINK( ClickAnonymousHdl_Impl, weld::ToggleButton&, void ); ///<
Checkbox : Anonymous User
DECL_LINK( ModifiedLoginHdl_Impl, weld::Entry&, void ); ///< Contents of
editfield "Login" modified
DECL_LINK( LostFocusTargetHdl_Impl, weld::Widget&, void ); ///< Combobox
"Target" lost its focus
DECL_LINK( ModifiedTargetHdl_Impl, weld::ComboBox&, void ); ///<
Contents of editfield "Target" modified
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 62f2ba036771..5f94d06c0d6d 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -47,7 +47,7 @@ class PasswordToOpenModifyDialog : public SfxDialogController
DECL_LINK(OkBtnClickHdl, weld::Button&, void);
- DECL_LINK(ReadonlyOnOffHdl, weld::Button&, void);
+ DECL_LINK(ReadonlyOnOffHdl, weld::ToggleButton&, void);
DECL_LINK(ChangeHdl, weld::Entry&, void);
PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) = delete;
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx
b/dbaccess/source/ui/dlg/adtabdlg.cxx
index bab1b0ca78bf..335a346e2e28 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -347,8 +347,7 @@ OAddTableDlg::OAddTableDlg(weld::Window* pParent,
IAddTableDialogContext& _rCont
rTableList.set_size_request(aSize.Width(), aSize.Height());
m_xQueryList->set_size_request(aSize.Width(), aSize.Height());
- m_xCaseTables->connect_clicked( LINK( this, OAddTableDlg, OnTypeSelected )
);
- m_xCaseQueries->connect_clicked( LINK( this, OAddTableDlg, OnTypeSelected
) );
+ m_xCaseTables->connect_toggled(LINK(this, OAddTableDlg, OnTypeSelected));
m_xAddButton->connect_clicked( LINK( this, OAddTableDlg, AddClickHdl ) );
m_xCloseButton->connect_clicked( LINK( this, OAddTableDlg, CloseClickHdl )
);
rTableList.connect_row_activated( LINK( this, OAddTableDlg,
TableListDoubleClickHdl ) );
@@ -435,7 +434,7 @@ IMPL_LINK_NOARG( OAddTableDlg, CloseClickHdl,
weld::Button&, void )
m_xDialog->response(RET_CLOSE);
}
-IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected, weld::Button&, void )
+IMPL_LINK_NOARG(OAddTableDlg, OnTypeSelected, weld::ToggleButton&, void)
{
if ( m_xCaseTables->get_active() )
impl_switchTo( Tables );
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx
b/dbaccess/source/ui/dlg/detailpages.cxx
index 1ce6475b6573..6f7e51e186d7 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -164,7 +164,7 @@ namespace dbaui
, m_xIndexes(m_xBuilder->weld_button("indiciesButton"))
{
m_xIndexes->connect_clicked(LINK(this, ODbaseDetailsPage,
OnButtonClicked));
- m_xShowDeleted->connect_clicked(LINK(this, ODbaseDetailsPage,
OnButtonClicked));
+ m_xShowDeleted->connect_toggled(LINK(this, ODbaseDetailsPage,
OnButtonToggled));
}
ODbaseDetailsPage::~ODbaseDetailsPage()
@@ -209,21 +209,20 @@ namespace dbaui
return bChangedSomething;
}
- IMPL_LINK(ODbaseDetailsPage, OnButtonClicked, weld::Button&, rButton, void)
+ IMPL_LINK_NOARG(ODbaseDetailsPage, OnButtonClicked, weld::Button&, void)
{
- if (m_xIndexes.get() == &rButton)
- {
- ODbaseIndexDialog aIndexDialog(GetFrameWeld(), m_sDsn);
- aIndexDialog.run();
- }
- else
- {
- m_xFT_Message->set_visible(m_xShowDeleted->get_active());
- // it was one of the checkboxes -> we count as modified from now on
- callModifiedHdl();
- }
+ ODbaseIndexDialog aIndexDialog(GetFrameWeld(), m_sDsn);
+ aIndexDialog.run();
}
+ IMPL_LINK_NOARG(ODbaseDetailsPage, OnButtonToggled, weld::ToggleButton&,
void)
+ {
+ m_xFT_Message->set_visible(m_xShowDeleted->get_active());
+ // it was the checkbox -> we count as modified from now on
+ callModifiedHdl();
+ }
+
+
// OAdoDetailsPage
OAdoDetailsPage::OAdoDetailsPage(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
: OCommonBehaviourTabPage(pPage, pController,
"dbaccess/ui/autocharsetpage.ui", "AutoCharset",
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx
b/dbaccess/source/ui/dlg/detailpages.hxx
index 07ea1bb1ab88..d93d8dffa88e 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -101,6 +101,7 @@ namespace dbaui
private:
DECL_LINK(OnButtonClicked, weld::Button&, void);
+ DECL_LINK(OnButtonToggled, weld::ToggleButton&, void);
};
// OAdoDetailsPage
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index fa24be183a09..89aabbc0d27f 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -116,7 +116,7 @@ namespace dbaui
fillIndexList();
- m_xUnique->connect_clicked(LINK(this, DbaIndexDialog,
OnModifiedClick));
+ m_xUnique->connect_toggled(LINK(this, DbaIndexDialog,
OnModifiedClick));
m_xFields->SetModifyHdl(LINK(this, DbaIndexDialog, OnModified));
m_xClose->connect_clicked(LINK(this, DbaIndexDialog, OnCloseDialog));
@@ -615,7 +615,7 @@ namespace dbaui
return true;
}
- IMPL_LINK_NOARG(DbaIndexDialog, OnModifiedClick, weld::Button&, void)
+ IMPL_LINK_NOARG(DbaIndexDialog, OnModifiedClick, weld::ToggleButton&, void)
{
OnModified(*m_xFields);
}
diff --git a/dbaccess/source/ui/inc/WCPage.hxx
b/dbaccess/source/ui/inc/WCPage.hxx
index 2ebb3a5ec441..d56f983199bb 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -42,7 +42,7 @@ namespace dbaui
DECL_LINK( AppendDataClickHdl, weld::Button&, void );
DECL_LINK( RadioChangeHdl, weld::Button&, void );
- DECL_LINK( KeyClickHdl, weld::Button&, void );
+ DECL_LINK( KeyClickHdl, weld::ToggleButton&, void );
bool checkAppendData();
void SetAppendDataRadio();
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx
b/dbaccess/source/ui/inc/adtabdlg.hxx
index a6842081d2dc..c79eec0467e0 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -70,7 +70,7 @@ namespace dbaui
DECL_LINK( CloseClickHdl, weld::Button&, void);
DECL_LINK( TableListDoubleClickHdl, weld::TreeView&, bool );
DECL_LINK( TableListSelectHdl, weld::TreeView&, void );
- DECL_LINK( OnTypeSelected, weld::Button&, void );
+ DECL_LINK( OnTypeSelected, weld::ToggleButton&, void );
public:
OAddTableDlg(weld::Window* _pParent,
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx
b/dbaccess/source/ui/inc/indexdialog.hxx
index ca2e0114d1d6..aa817171a184 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -77,7 +77,7 @@ namespace dbaui
DECL_LINK( OnIndexAction, const OString&, void );
DECL_LINK( OnEntryEditing, const weld::TreeIter&, bool );
DECL_LINK( OnEntryEdited, const IterString&, bool );
- DECL_LINK( OnModifiedClick, weld::Button&, void );
+ DECL_LINK( OnModifiedClick, weld::ToggleButton&, void );
DECL_LINK( OnModified, IndexFieldsControl&, void );
DECL_LINK( OnCloseDialog, weld::Button&, void );
diff --git a/dbaccess/source/ui/misc/WCPage.cxx
b/dbaccess/source/ui/misc/WCPage.cxx
index 35c8a7fe0f18..3362f17250fe 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -72,7 +72,7 @@ OCopyTable::OCopyTable(weld::Container* pPage,
OCopyTableWizard* pWizard)
m_xRB_Def->connect_clicked( LINK( this, OCopyTable,
RadioChangeHdl ) );
m_xRB_View->connect_clicked( LINK( this, OCopyTable,
RadioChangeHdl ) );
- m_xCB_PrimaryColumn->connect_clicked(LINK( this, OCopyTable,
KeyClickHdl ) );
+ m_xCB_PrimaryColumn->connect_toggled(LINK( this, OCopyTable,
KeyClickHdl ) );
m_xFT_KeyName->set_sensitive(false);
m_xEdKeyName->set_sensitive(false);
@@ -121,7 +121,7 @@ IMPL_LINK(OCopyTable, RadioChangeHdl, weld::Button&,
rButton, void)
m_pParent->setOperation( CopyTableOperation::CreateAsView );
}
-IMPL_LINK_NOARG( OCopyTable, KeyClickHdl, weld::Button&, void )
+IMPL_LINK_NOARG( OCopyTable, KeyClickHdl, weld::ToggleButton&, void )
{
m_xEdKeyName->set_sensitive(m_xCB_PrimaryColumn->get_active());
m_xFT_KeyName->set_sensitive(m_xCB_PrimaryColumn->get_active());
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 8a5e66753cf6..9963baa7c799 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -92,8 +92,8 @@ void ScSamplingDialog::Init()
mxPeriodicMethodRadio->connect_toggled( LINK( this, ScSamplingDialog,
ToggleSamplingMethod ) );
mxRandomMethodRadio->connect_toggled( LINK( this, ScSamplingDialog,
ToggleSamplingMethod ) );
- mxWithReplacement->connect_clicked( LINK( this, ScSamplingDialog,
CheckHdl));
- mxKeepOrder->connect_clicked( LINK( this, ScSamplingDialog, CheckHdl));
+ mxWithReplacement->connect_toggled( LINK( this, ScSamplingDialog,
CheckHdl));
+ mxKeepOrder->connect_toggled( LINK( this, ScSamplingDialog, CheckHdl));
mxOutputRangeEdit->GrabFocus();
mxPeriodicMethodRadio->set_active(true);
@@ -466,7 +466,7 @@ void ScSamplingDialog::ToggleSamplingMethod()
}
}
-IMPL_LINK(ScSamplingDialog, CheckHdl, weld::Button&, rBtn, void)
+IMPL_LINK(ScSamplingDialog, CheckHdl, weld::ToggleButton&, rBtn, void)
{
// Keep both checkboxes enabled so user can easily switch between the three
// possible combinations (one or the other or none), just uncheck the other
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index db015dcaa268..1b417eb4d326 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -129,8 +129,8 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
m_xBtnClear->connect_clicked ( LINK( this, ScFilterDlg, BtnClearHdl ) );
m_xBtnOk->connect_clicked ( LINK( this, ScFilterDlg, EndDlgHdl ) );
m_xBtnCancel->connect_clicked ( LINK( this, ScFilterDlg, EndDlgHdl ) );
- m_xBtnHeader->connect_clicked ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
- m_xBtnCase->connect_clicked ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
+ m_xBtnHeader->connect_toggled ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
+ m_xBtnCase->connect_toggled ( LINK( this, ScFilterDlg, CheckBoxHdl ) );
m_xLbField1->connect_changed ( LINK( this, ScFilterDlg, LbSelectHdl ) );
m_xLbField2->connect_changed ( LINK( this, ScFilterDlg, LbSelectHdl ) );
@@ -1003,7 +1003,7 @@ IMPL_LINK(ScFilterDlg, LbSelectHdl, weld::ComboBox&, rLb,
void)
}
}
-IMPL_LINK( ScFilterDlg, CheckBoxHdl, weld::Button&, rBox, void )
+IMPL_LINK( ScFilterDlg, CheckBoxHdl, weld::ToggleButton&, rBox, void )
{
// Column headers:
// Field list: Columnxx <-> column header string
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 2abb8e53e441..ca74136968d6 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -403,7 +403,7 @@ void ScTPValidationValue::Init()
{
m_xLbAllow->connect_changed( LINK( this, ScTPValidationValue, SelectHdl )
);
m_xLbValue->connect_changed( LINK( this, ScTPValidationValue, SelectHdl )
);
- m_xCbShow->connect_clicked( LINK( this, ScTPValidationValue, CheckHdl ) );
+ m_xCbShow->connect_toggled( LINK( this, ScTPValidationValue, CheckHdl ) );
// cell range picker
m_xEdMin->SetGetFocusHdl( LINK( this, ScTPValidationValue, EditSetFocusHdl
) );
@@ -688,7 +688,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl,
weld::ComboBox&, void)
m_xBtnRef->GetWidget()->set_visible( bRange ); // cell range picker
}
-IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, weld::Button&, void)
+IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, weld::ToggleButton&, void)
{
m_xCbSort->set_sensitive( m_xCbShow->get_active() );
}
diff --git a/sc/source/ui/inc/SamplingDialog.hxx
b/sc/source/ui/inc/SamplingDialog.hxx
index 86d207aa2548..23b727d40083 100644
--- a/sc/source/ui/inc/SamplingDialog.hxx
+++ b/sc/source/ui/inc/SamplingDialog.hxx
@@ -84,7 +84,7 @@ private:
DECL_LINK( PeriodValueModified, weld::SpinButton&, void );
DECL_LINK( ToggleSamplingMethod, weld::ToggleButton&, void );
DECL_LINK( RefInputModifyHandler, formula::RefEdit&, void );
- DECL_LINK( CheckHdl, weld::Button&, void );
+ DECL_LINK( CheckHdl, weld::ToggleButton&, void );
void ToggleSamplingMethod();
};
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 9e157b9190d7..f65195bc566a 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -154,7 +154,7 @@ private:
// Handler:
DECL_LINK( LbSelectHdl, weld::ComboBox&, void );
DECL_LINK( ValModifyHdl, weld::ComboBox&, void );
- DECL_LINK( CheckBoxHdl, weld::Button&, void );
+ DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void );
DECL_LINK( BtnClearHdl, weld::Button&, void );
DECL_LINK( BtnRemoveHdl, weld::Button&, void );
DECL_LINK( EndDlgHdl, weld::Button&, void );
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 563f8f81d2b3..4fcc0e5320bf 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -50,7 +50,7 @@ private:
void Init();
DECL_LINK( RefHandle, SvxTPFilter*, void );
- DECL_LINK( HighlightHandle, weld::Button&, void );
+ DECL_LINK( HighlightHandle, weld::ToggleButton&, void );
DECL_LINK( OKBtnHdl, weld::Button&, void );
protected:
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 82b3cd5968b3..9216c8b75766 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -96,7 +96,7 @@ private:
void SetSecondFormula( const OUString& rFmlaStr );
DECL_LINK(SelectHdl, weld::ComboBox&, void);
- DECL_LINK(CheckHdl, weld::Button&, void);
+ DECL_LINK(CheckHdl, weld::ToggleButton&, void);
OUString maStrMin;
OUString maStrMax;
diff --git a/sc/source/ui/miscdlgs/highred.cxx
b/sc/source/ui/miscdlgs/highred.cxx
index 5a63bb87fb36..c75220824fe7 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -43,7 +43,7 @@ ScHighlightChgDlg::ScHighlightChgDlg(SfxBindings* pB,
SfxChildWindow* pCW, weld:
m_xRbAssign->SetReferences(this, m_xEdAssign.get());
m_xOkButton->connect_clicked(LINK( this, ScHighlightChgDlg, OKBtnHdl));
- m_xHighlightBox->connect_clicked(LINK( this, ScHighlightChgDlg,
HighlightHandle ));
+ m_xHighlightBox->connect_toggled(LINK( this, ScHighlightChgDlg,
HighlightHandle ));
m_xFilterCtr->SetRefHdl(LINK( this, ScHighlightChgDlg, RefHandle ));
m_xFilterCtr->HideRange(false);
m_xFilterCtr->Show();
@@ -161,7 +161,7 @@ bool ScHighlightChgDlg::IsRefInputMode() const
return m_xEdAssign->GetWidget()->get_visible();
}
-IMPL_LINK_NOARG(ScHighlightChgDlg, HighlightHandle, weld::Button&, void)
+IMPL_LINK_NOARG(ScHighlightChgDlg, HighlightHandle, weld::ToggleButton&, void)
{
if (m_xHighlightBox->get_active())
{
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 05dafb14430a..6639024a8baf 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -131,8 +131,7 @@ SwLoadOptPage::SwLoadOptPage(weld::Container* pPage,
weld::DialogController* pCo
m_xUseCharUnit->hide();
}
- Link<weld::Button&,void> aLink = LINK(this, SwLoadOptPage,
StandardizedPageCountCheckHdl);
- m_xShowStandardizedPageCount->connect_clicked(aLink);
+ m_xShowStandardizedPageCount->connect_toggled(LINK(this, SwLoadOptPage,
StandardizedPageCountCheckHdl));
}
SwLoadOptPage::~SwLoadOptPage()
@@ -145,7 +144,7 @@ std::unique_ptr<SfxTabPage> SwLoadOptPage::Create(
weld::Container* pPage, weld:
return std::make_unique<SwLoadOptPage>(pPage, pController, *rAttrSet );
}
-IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, weld::Button&,
void)
+IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl,
weld::ToggleButton&, void)
{
m_xStandardizedPageSizeNF->set_sensitive(m_xShowStandardizedPageCount->get_active());
}
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 0bb020800765..4f8b8c23ca2b 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -77,7 +77,7 @@ private:
std::unique_ptr<weld::SpinButton> m_xStandardizedPageSizeNF;
DECL_LINK(MetricHdl, weld::ComboBox&, void);
- DECL_LINK(StandardizedPageCountCheckHdl, weld::Button&, void);
+ DECL_LINK(StandardizedPageCountCheckHdl, weld::ToggleButton&, void);
public:
SwLoadOptPage(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
