add Toggleable as a separate thing to a Button

and inherit ToggleButton from both it and Button

Change-Id: If0e500aca8d0ffa087cb5e2bfc1786372fbff4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

94 files changed, 153 insertions, 154 deletions

diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index f2e0155b578b..9c59007314af 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -121,7 +121,7 @@ const char* ScAnalysisOfVarianceDialog::GetUndoNameId()
     return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME;
 }
 
-IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, weld::Toggleable&, void )
 {
     FactorChanged();
 }
diff --git a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
index 9688e17ac68f..69da12adc126 100644
--- a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
@@ -223,7 +223,7 @@ void ScFourierAnalysisDialog::genFormula(OUString& rFormula)
                + OUString::boolean(mbInverse) + ";true;" + OUString::number(mfMinMag) + ")";
 }
 
-IMPL_LINK_NOARG(ScFourierAnalysisDialog, CheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScFourierAnalysisDialog, CheckBoxHdl, weld::Toggleable&, void)
 {
     ValidateDialogInput();
 }
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 68f04630de29..3aa6b93626ee 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -382,7 +382,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified, weld::Sp
     }
 }
 
-IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, weld::Toggleable&, void)
 {
     mxSeed->set_sensitive(mxEnableSeed->get_active());
     mxDecimalPlaces->set_sensitive(mxEnableRounding->get_active());
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 7f0dd05cee94..5a4002f97d62 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -678,7 +678,7 @@ void ScRegressionDialog::WriteTable(const std::function<CellValueGetter>& rCellG
     }
 }
 
-IMPL_LINK_NOARG(ScRegressionDialog, CheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScRegressionDialog, CheckBoxHdl, weld::Toggleable&, void)
 {
     ValidateDialogInput();
 }
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 9963baa7c799..608ba1a30fa1 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -440,7 +440,7 @@ IMPL_LINK_NOARG(ScSamplingDialog, LoseButtonFocusHandler, formula::RefButton&, v
     mDialogLostFocus = !m_xDialog->has_toplevel_focus();
 }
 
-IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod, weld::Toggleable&, void)
 {
     ToggleSamplingMethod();
 }
@@ -466,7 +466,7 @@ void ScSamplingDialog::ToggleSamplingMethod()
     }
 }
 
-IMPL_LINK(ScSamplingDialog, CheckHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScSamplingDialog, CheckHdl, weld::Toggleable&, 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/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index d275d79c6524..7447ebf9a35a 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -216,7 +216,7 @@ IMPL_LINK_NOARG(ScStatisticsInputOutputDialog, LoseButtonFocusHandler, formula::
     mDialogLostFocus = !m_xDialog->has_toplevel_focus();
 }
 
-IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, GroupByChanged, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, GroupByChanged, weld::Toggleable&, void )
 {
     if (mxGroupByColumnsRadio->get_active())
         mGroupedBy = BY_COLUMN;
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index df93a0533b1d..3c0f7ce98b56 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -242,7 +242,7 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, LoseButtonFocusHandler, formula:
     mDialogLostFocus = !m_xDialog->has_toplevel_focus();
 }
 
-IMPL_LINK_NOARG(ScStatisticsTwoVariableDialog, GroupByChanged, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScStatisticsTwoVariableDialog, GroupByChanged, weld::Toggleable&, void)
 {
     if (mxGroupByColumnsRadio->get_active())
         mGroupedBy = BY_COLUMN;
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 572e1dc362f6..5957de8d1c2d 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -141,31 +141,31 @@ DeactivateRC ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
     return DeactivateRC::LeavePage;
 }
 
-IMPL_LINK(ScTabPageProtection, ProtectClickHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTabPageProtection, ProtectClickHdl, weld::Toggleable&, rBox, void)
 {
     aProtectState.ButtonToggled(rBox);
     ButtonClick(rBox);
 }
 
-IMPL_LINK(ScTabPageProtection, HideCellClickHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTabPageProtection, HideCellClickHdl, weld::Toggleable&, rBox, void)
 {
     aHideCellState.ButtonToggled(rBox);
     ButtonClick(rBox);
 }
 
-IMPL_LINK(ScTabPageProtection, HideFormulaClickHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTabPageProtection, HideFormulaClickHdl, weld::Toggleable&, rBox, void)
 {
     aHideFormulaState.ButtonToggled(rBox);
     ButtonClick(rBox);
 }
 
-IMPL_LINK(ScTabPageProtection, HidePrintClickHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTabPageProtection, HidePrintClickHdl, weld::Toggleable&, rBox, void)
 {
     aHidePrintState.ButtonToggled(rBox);
     ButtonClick(rBox);
 }
 
-void ScTabPageProtection::ButtonClick(weld::ToggleButton& rBox)
+void ScTabPageProtection::ButtonClick(weld::Toggleable& rBox)
 {
     TriState eState = rBox.get_state();
     if (eState == TRISTATE_INDET)
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 1e8cb5662d82..c8df91c57872 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -662,7 +662,7 @@ IMPL_LINK(ScCheckListMenuControl, ButtonHdl, weld::Button&, rBtn, void)
     }
 }
 
-IMPL_LINK_NOARG(ScCheckListMenuControl, TriStateHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScCheckListMenuControl, TriStateHdl, weld::Toggleable&, void)
 {
     switch (mePrevToggleAllState)
     {
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 700f189e19ef..39357771105d 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -112,7 +112,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
     , mxMore(m_xBuilder->weld_expander("more"))
 {
     // Source UI
-    Link<weld::ToggleButton&,void> aLink2 = LINK(this, ScPivotLayoutDialog, ToggleSource);
+    Link<weld::Toggleable&,void> aLink2 = LINK(this, ScPivotLayoutDialog, ToggleSource);
     mxSourceRadioNamedRange->connect_toggled(aLink2);
     mxSourceRadioSelection->connect_toggled(aLink2);
 
@@ -686,7 +686,7 @@ IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified, formula::RefEdit&, void
     UpdateSourceRange();
 }
 
-IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleSource, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleSource, weld::Toggleable&, void)
 {
     ToggleSource();
 }
@@ -701,7 +701,7 @@ void ScPivotLayoutDialog::ToggleSource()
     UpdateSourceRange();
 }
 
-IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleDestination, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleDestination, weld::Toggleable&, void)
 {
     ToggleDestination();
 }
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 15acb8c65553..9843a2bb975b 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -101,7 +101,7 @@ void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName)
     }
 }
 
-IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl, weld::Toggleable&, void)
 {
     m_xLbNamedRange->set_sensitive(m_xBtnNamedRange->get_active());
 }
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index d260b4337680..4846a9c48aed 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -93,7 +93,7 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double fValue )
     ImplSetValue( fValue );
 }
 
-IMPL_LINK(ScDPGroupEditHelper, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ScDPGroupEditHelper, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -302,7 +302,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const
     return nDatePart;
 }
 
-IMPL_LINK(ScDPDateGroupDlg, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ScDPDateGroupDlg, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 1b417eb4d326..7e6808f655d7 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -1003,7 +1003,7 @@ IMPL_LINK(ScFilterDlg, LbSelectHdl, weld::ComboBox&, rLb, void)
     }
 }
 
-IMPL_LINK( ScFilterDlg, CheckBoxHdl, weld::ToggleButton&, rBox, void )
+IMPL_LINK( ScFilterDlg, CheckBoxHdl, weld::Toggleable&, rBox, void )
 {
     //  Column headers:
     //      Field list: Columnxx <-> column header string
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index da323ed2f8bb..ac06054ac9be 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -239,7 +239,7 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, formula::RefEdit&, rEd, void )
     pLbCopyArea->set_active( 0 );
 }
 
-IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, weld::ToggleButton&, rBox, void )
+IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, weld::Toggleable&, rBox, void )
 {
     if ( &rBox != pBtnCopyResult )
         return;
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 1fe50d32a204..04abc907e7c4 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -463,7 +463,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, weld::ComboBox&, rLb, void )
     }
 }
 
-IMPL_LINK(ScPivotFilterDlg, CheckBoxHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScPivotFilterDlg, CheckBoxHdl, weld::Toggleable&, rBox, void)
 {
     // update the value lists when dealing with uppercase/lowercase
 
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 6c1e006ecbc5..90a13e920352 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -562,7 +562,7 @@ IMPL_LINK(ScDPSubtotalDlg, ButtonClicked, weld::Button&, rButton, void)
         response(RET_CANCEL);
 }
 
-IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::Toggleable&, rBtn, void)
 {
     if (!rBtn.get_active())
         return;
@@ -876,7 +876,7 @@ IMPL_LINK(ScDPSubtotalOptDlg, ButtonClicked, weld::Button&, rButton, void)
         response(RET_CANCEL);
 }
 
-IMPL_LINK(ScDPSubtotalOptDlg, RadioClickHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScDPSubtotalOptDlg, RadioClickHdl, weld::Toggleable&, rBtn, void)
 {
     if (!rBtn.get_active())
         return;
@@ -884,7 +884,7 @@ IMPL_LINK(ScDPSubtotalOptDlg, RadioClickHdl, weld::ToggleButton&, rBtn, void)
     m_xLbSortBy->set_sensitive(m_xRbSortMan->get_active());
 }
 
-IMPL_LINK(ScDPSubtotalOptDlg, CheckHdl, weld::ToggleButton&, rCBox, void)
+IMPL_LINK(ScDPSubtotalOptDlg, CheckHdl, weld::Toggleable&, rCBox, void)
 {
     if (&rCBox == m_xCbShow.get())
     {
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index a1bc89825196..f287bf1c440c 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -154,7 +154,7 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl, weld::Button&, void)
     //! when editing, test whether another table has the name!
 }
 
-IMPL_LINK(ScNewScenarioDlg, EnableHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScNewScenarioDlg, EnableHdl, weld::Toggleable&, rBox, void)
 {
     if (&rBox == m_xCbShowFrame.get())
         m_xLbColor->set_sensitive(m_xCbShowFrame->get_active());
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 1347bf645112..395d2595937b 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -431,7 +431,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa
     lcl_FillCombo( *mxCbTextSep, gaTextSepList, mcTextSep );
     mxCbTextSep->set_entry_text(sTextSeparators);
 
-    Link<weld::ToggleButton&,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl );
+    Link<weld::Toggleable&,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl );
     mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg, SeparatorComboBoxHdl ) );
     mxCkbTab->connect_toggled( aSeparatorClickHdl );
     mxCkbSemicolon->connect_toggled( aSeparatorClickHdl );
@@ -706,14 +706,14 @@ void ScImportAsciiDlg::RbSepFix()
     SetupSeparatorCtrls();
 }
 
-IMPL_LINK(ScImportAsciiDlg, RbSepFixHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ScImportAsciiDlg, RbSepFixHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
     RbSepFix();
 }
 
-IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::ToggleButton&, rCtrl, void)
+IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::Toggleable&, rCtrl, void)
 {
     SeparatorHdl(&rCtrl);
 }
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 9969251729e8..30bd89823f89 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -305,7 +305,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo(const weld::ComboBox& rEd) const
     return nCode;
 }
 
-IMPL_LINK_NOARG(ScImportOptionsDlg, FixedWidthHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScImportOptionsDlg, FixedWidthHdl, weld::Toggleable&, void)
 {
     bool bEnable = !m_xCbFixed->get_active();
     m_xFtFieldSep->set_sensitive( bEnable );
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index b8e99ca2e6df..99ddc425da37 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -62,7 +62,7 @@ bool ScTextImportOptionsDlg::isKeepAskingSet() const
 void ScTextImportOptionsDlg::init()
 {
     m_xBtnOk->connect_clicked(LINK(this, ScTextImportOptionsDlg, OKHdl));
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ScTextImportOptionsDlg, RadioHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ScTextImportOptionsDlg, RadioHdl);
     m_xRbAutomatic->connect_toggled(aLink);
     m_xRbCustom->connect_toggled(aLink);
 
@@ -81,7 +81,7 @@ IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK(ScTextImportOptionsDlg, RadioHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScTextImportOptionsDlg, RadioHdl, weld::Toggleable&, rBtn, void)
 {
     if (&rBtn == m_xRbAutomatic.get())
     {
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index c0b84d022274..87989f0069d7 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -796,7 +796,7 @@ void ScTabPageSortOptions::FillUserSortListBox()
 
 // Handler:
 
-IMPL_LINK( ScTabPageSortOptions, EnableHdl, weld::ToggleButton&, rButton, void )
+IMPL_LINK( ScTabPageSortOptions, EnableHdl, weld::Toggleable&, rButton, void )
 {
     if (&rButton == m_xBtnCopyResult.get())
     {
@@ -838,7 +838,7 @@ IMPL_LINK(ScTabPageSortOptions, SelOutPosHdl, weld::ComboBox&, rLb, void)
     }
 }
 
-IMPL_LINK_NOARG(ScTabPageSortOptions, SortDirHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScTabPageSortOptions, SortDirHdl, weld::Toggleable&, void)
 {
     if (m_xBtnTopDown->get_active())
         m_xBtnHeader->set_label(aStrColLabel);
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 57b34a9b09f9..b9496fdef35e 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -551,7 +551,7 @@ void ScTpSubTotalOptions::FillUserSortListBox()
 
 // Handler:
 
-IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::Toggleable&, rBox, void)
 {
     if (&rBox == m_xBtnSort.get())
     {
@@ -588,7 +588,7 @@ IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::ToggleButton&, rBox, void)
     }
 }
 
-IMPL_LINK(ScTpSubTotalGroup, CheckBoxHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTpSubTotalGroup, CheckBoxHdl, weld::Toggleable&, rBox, void)
 {
     if (&rBox != mxLbSelectAllColumns.get())
         return;
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index ca74136968d6..b3d471d886a5 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -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::ToggleButton&, void)
+IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, weld::Toggleable&, void)
 {
     m_xCbSort->set_sensitive( m_xCbShow->get_active() );
 }
diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx
index 2ad53cfde7e8..c9558c5376f3 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -236,7 +236,7 @@ IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl, weld::TreeView&, void )
     pScViewShell->AlignToCursor(aPos.Col(), aPos.Row(), SC_FOLLOW_JUMP);
 }
 
-IMPL_STATIC_LINK( SearchResultsDlg, OnShowToggled, weld::ToggleButton&, rButton, void )
+IMPL_STATIC_LINK( SearchResultsDlg, OnShowToggled, weld::Toggleable&, rButton, void )
 {
     ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell();
     ScViewOptions aViewOpt( pScViewShell->GetViewData().GetOptions() );
diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
index 78506127a32e..675cc422e1e6 100644
--- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
+++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
@@ -27,7 +27,7 @@ private:
         TWO_FACTOR
     };
 
-    DECL_LINK(FactorChanged, weld::ToggleButton&, void);
+    DECL_LINK(FactorChanged, weld::Toggleable&, void);
     void FactorChanged();
 
     AnovaFactor meFactor;
diff --git a/sc/source/ui/inc/FourierAnalysisDialog.hxx b/sc/source/ui/inc/FourierAnalysisDialog.hxx
index 3814c6e7487d..ab9507e31c49 100644
--- a/sc/source/ui/inc/FourierAnalysisDialog.hxx
+++ b/sc/source/ui/inc/FourierAnalysisDialog.hxx
@@ -50,7 +50,7 @@ private:
     void getDataLabel(OUString& rLabel);
     void genFormula(OUString& rFormula);
 
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx
index fe5d0bf40a8d..0ce026bf4047 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -93,8 +93,8 @@ private:
     DECL_LINK(GetButtonFocusHandler, formula::RefButton&, void);
     DECL_LINK(LoseEditFocusHandler, formula::RefEdit&, void);
     DECL_LINK(LoseButtonFocusHandler, formula::RefButton&, void);
-    DECL_LINK(ToggleSource, weld::ToggleButton&, void);
-    DECL_LINK(ToggleDestination, weld::ToggleButton&, void);
+    DECL_LINK(ToggleSource, weld::Toggleable&, void);
+    DECL_LINK(ToggleDestination, weld::Toggleable&, void);
     DECL_LINK(SourceListSelected, weld::ComboBox&, void);
     DECL_LINK(SourceEditModified, formula::RefEdit&, void);
     void ToggleSource();
diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
index 4fb20954fd09..40a457732909 100644
--- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
+++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
@@ -78,7 +78,7 @@ private:
     DECL_LINK( Parameter1ValueModified, weld::SpinButton&, void );
     DECL_LINK( Parameter2ValueModified, weld::SpinButton&, void );
     DECL_LINK( DistributionChanged, weld::ComboBox&, void );
-    DECL_LINK( CheckChanged, weld::ToggleButton&, void );
+    DECL_LINK( CheckChanged, weld::Toggleable&, void );
 
 };
 
diff --git a/sc/source/ui/inc/RegressionDialog.hxx b/sc/source/ui/inc/RegressionDialog.hxx
index 7872b2660fc0..cab704d96384 100644
--- a/sc/source/ui/inc/RegressionDialog.hxx
+++ b/sc/source/ui/inc/RegressionDialog.hxx
@@ -74,7 +74,7 @@ private:
                     size_t nColsInTable, AddressWalkerWriter& rOutput,
                     const std::function<CellWriter>& rFunc);
 
-    DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void );
+    DECL_LINK( CheckBoxHdl, weld::Toggleable&, void );
     DECL_LINK( NumericFieldHdl, weld::SpinButton&, void );
 };
 
diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx
index 23b727d40083..e561092a80f1 100644
--- a/sc/source/ui/inc/SamplingDialog.hxx
+++ b/sc/source/ui/inc/SamplingDialog.hxx
@@ -82,9 +82,9 @@ private:
     DECL_LINK( LoseButtonFocusHandler, formula::RefButton&, void );
     DECL_LINK( SamplingSizeValueModified, weld::SpinButton&, void );
     DECL_LINK( PeriodValueModified, weld::SpinButton&, void );
-    DECL_LINK( ToggleSamplingMethod, weld::ToggleButton&, void );
+    DECL_LINK( ToggleSamplingMethod, weld::Toggleable&, void );
     DECL_LINK( RefInputModifyHandler, formula::RefEdit&, void );
-    DECL_LINK( CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK( CheckHdl, weld::Toggleable&, void );
     void ToggleSamplingMethod();
 };
 
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index 6e3a082d84a4..6f35e75472ea 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -77,7 +77,7 @@ private:
     void Init();
     void GetRangeFromSelection();
 
-    DECL_LINK( GroupByChanged, weld::ToggleButton&, void );
+    DECL_LINK( GroupByChanged, weld::Toggleable&, void );
     DECL_LINK( ButtonClicked, weld::Button&, void );
     DECL_LINK( GetEditFocusHandler,  formula::RefEdit&, void );
     DECL_LINK( GetButtonFocusHandler,  formula::RefButton&, void );
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index 875e9a4f29d7..8ac10b3c42df 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -79,7 +79,7 @@ private:
     void Init();
     void GetRangeFromSelection();
 
-    DECL_LINK( GroupByChanged, weld::ToggleButton&, void );
+    DECL_LINK( GroupByChanged, weld::Toggleable&, void );
     DECL_LINK( ButtonClicked, weld::Button&, void );
     DECL_LINK( GetEditFocusHandler, formula::RefEdit&, void );
     DECL_LINK( GetButtonFocusHandler, formula::RefButton&, void );
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 363de1b51a78..6c3dbfd53d46 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -219,7 +219,7 @@ private:
     void NotifyCloseLOK();
 
     DECL_LINK(ButtonHdl, weld::Button&, void);
-    DECL_LINK(TriStateHdl, weld::ToggleButton&, void);
+    DECL_LINK(TriStateHdl, weld::Toggleable&, void);
 
     void Check(const weld::TreeIter* pIter);
 
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index 6162eb3f76ca..5bff6d2e8c13 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -83,7 +83,7 @@ private:
     DECL_LINK( RemoveBtnHdl, weld::Button&, void );
     DECL_LINK( Range1SelectHdl, weld::TreeView&, void );
     DECL_LINK( Range1DataModifyHdl, formula::RefEdit&, void );
-    DECL_LINK( ColRowToggleHdl, weld::ToggleButton&, void );
+    DECL_LINK( ColRowToggleHdl, weld::Toggleable&, void );
     DECL_LINK( Range2DataModifyHdl, formula::RefEdit&, void );
     DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void );
     DECL_LINK( LoseEditFocusHdl, formula::RefEdit&, void );
diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx
index bd807a5e01a5..e45400cdf6b2 100644
--- a/sc/source/ui/inc/dapitype.hxx
+++ b/sc/source/ui/inc/dapitype.hxx
@@ -42,7 +42,7 @@ public:
     void AppendNamedRange(const OUString& rNames);
 
 private:
-    DECL_LINK(RadioClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(RadioClickHdl, weld::Toggleable&, void);
     DECL_LINK(ResponseHdl, weld::Button&, void);
 };
 
diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx
index b2e5a6fbb299..5f1f7eec49e8 100644
--- a/sc/source/ui/inc/datastreamdlg.hxx
+++ b/sc/source/ui/inc/datastreamdlg.hxx
@@ -41,7 +41,7 @@ class DataStreamDlg : public weld::GenericDialogController
     std::unique_ptr<weld::Frame> m_xVclFrameLimit;
     std::unique_ptr<weld::Frame> m_xVclFrameMove;
 
-    DECL_LINK(UpdateClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(UpdateClickHdl, weld::Toggleable&, void);
     DECL_LINK(UpdateHdl, weld::Entry&, void);
     DECL_LINK(UpdateComboBoxHdl, weld::ComboBox&, void);
     DECL_LINK(BrowseHdl, weld::Button&, void);
diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx
index db3f6bd5cccb..c23deed4fcc6 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::ToggleButton&, void);
+    DECL_LINK(DelAllHdl, weld::Toggleable&, void);
 
 public:
     ScDeleteContentsDlg(weld::Window* pParent);
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 0682282b1c3a..d3c390f46087 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -43,7 +43,7 @@ private:
     virtual bool        ImplGetValue( double& rfValue ) const = 0;
     virtual void        ImplSetValue( double fValue ) = 0;
 
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
 
 private:
     weld::RadioButton& mrRbAuto;
@@ -115,7 +115,7 @@ public:
     sal_Int32 GetDatePart() const;
 
 private:
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
     DECL_LINK(CheckHdl, const weld::TreeView::iter_col&, void);
 
     void Check();
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index d794ec5b7d53..c52452841b6c 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -95,7 +95,7 @@ private:
     weld::Entry* CheckValues();
 
     DECL_LINK(OKHdl, weld::Button&, void);
-    DECL_LINK(DisableHdl, weld::ToggleButton&, void);
+    DECL_LINK(DisableHdl, weld::Toggleable&, void);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index f65195bc566a..ca11a0eb675d 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::ToggleButton&, void );
+    DECL_LINK( CheckBoxHdl,  weld::Toggleable&, 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/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index c21c766630d6..2a4fcd145623 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -77,7 +77,7 @@ private:
     // Handler:
     DECL_LINK( EdAreaModifyHdl, formula::RefEdit&, void );
     DECL_LINK( LbAreaSelHdl, weld::ComboBox&, void );
-    DECL_LINK( BtnCopyResultHdl, weld::ToggleButton&, void );
+    DECL_LINK( BtnCopyResultHdl, weld::Toggleable&, void );
 };
 
 
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index 4fcc0e5320bf..cfb706a8ec1d 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::ToggleButton&, void );
+    DECL_LINK( HighlightHandle, weld::Toggleable&, void );
     DECL_LINK( OKBtnHdl, weld::Button&, void );
 
 protected:
diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index b480eb6b4196..a30cffe0b355 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -94,8 +94,8 @@ private:
     void TestModes();
 
     // Handler
-    DECL_LINK( InsAllHdl, weld::ToggleButton&, void );
-    DECL_LINK( LinkBtnHdl, weld::ToggleButton&, void );
+    DECL_LINK( InsAllHdl, weld::Toggleable&, void );
+    DECL_LINK( LinkBtnHdl, weld::Toggleable&, void );
     DECL_LINK( ShortCutHdl, weld::Button&, void );
 };
 
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 6e97085b416d..618177fe0a6c 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -83,7 +83,7 @@ private:
     void    DoEnable_Impl();
 
     DECL_LINK( BrowseHdl_Impl, weld::Button&, void );
-    DECL_LINK( ChoiceHdl_Impl, weld::ToggleButton&, void );
+    DECL_LINK( ChoiceHdl_Impl, weld::Toggleable&, void );
     DECL_LINK( SelectHdl_Impl, weld::TreeView&, void );
     DECL_LINK( CountHdl_Impl, weld::SpinButton&, void );
     DECL_LINK( DoEnterHdl, weld::Button&, void );
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 02e022196d2e..b3ead95ddd65 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::ToggleButton&, void);
+    DECL_LINK(ReloadHdl, weld::Toggleable&, 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 823aa3cd77bd..fc4163a55e1d 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::ToggleButton&, void);
+    DECL_LINK(SetDefValHdl, weld::Toggleable&, void);
     DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void);
 };
 
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 00ed09204487..2f11fd3868b4 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -76,7 +76,7 @@ private:
     void    InitDocListBox  ();
     DECL_LINK(OkHdl, weld::Button&, void);
     DECL_LINK(SelHdl, weld::ComboBox&, void);
-    DECL_LINK(CheckBtnHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBtnHdl, weld::Toggleable&, void);
     DECL_LINK(CheckNameHdl, weld::Entry&, void);
 };
 
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 484500dcef4f..73b8dbcd756a 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -97,7 +97,7 @@ private:
     DECL_LINK(RemoveBtnHdl, weld::Button&, void);
     DECL_LINK(EdModifyHdl, weld::Entry&, void);
     DECL_LINK(RefEdModifyHdl, formula::RefEdit&, void);
-    DECL_LINK(EdModifyCheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(EdModifyCheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(AssignGetFocusHdl, formula::RefEdit&, void);
     DECL_LINK(SelectionChangedHdl_Impl, weld::TreeView&, void);
     DECL_LINK(ScopeChangedHdl, weld::ComboBox&, void);
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 630515519f5c..892d8655255f 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -87,7 +87,7 @@ private:
     // Handler:
     DECL_LINK( LbSelectHdl, weld::ComboBox&, void );
     DECL_LINK( ValModifyHdl, weld::ComboBox&, void );
-    DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void );
+    DECL_LINK( CheckBoxHdl, weld::Toggleable&, void );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx
index 08902610ec37..d36c8a820fad 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -63,7 +63,7 @@ private:
     void InsertEntry(const OUString& rTxt);
 
     DECL_LINK(OKHdl, weld::Button&, void);
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(PasswordModifyHdl, weld::Entry&, void);
 };
 
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index e0fc34011173..17a20526be02 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -109,7 +109,7 @@ private:
     void                CloseSubdialog();
 
     DECL_LINK( DblClickHdl, weld::TreeView&, bool );
-    DECL_LINK( RadioClickHdl, weld::ToggleButton&, void );
+    DECL_LINK( RadioClickHdl, weld::Toggleable&, void );
     DECL_LINK( ClickHdl, weld::Button&, void );
     DECL_LINK( ButtonClicked, weld::Button&, void );
 
@@ -151,8 +151,8 @@ private:
     /** Searches for a listbox entry, starts search at specified position. */
     sal_Int32 FindListBoxEntry( const weld::ComboBox& rLBox, std::u16string_view rEntry, sal_Int32 nStartPos ) const;
 
-    DECL_LINK( RadioClickHdl, weld::ToggleButton&, void );
-    DECL_LINK( CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK( RadioClickHdl, weld::Toggleable&, void );
+    DECL_LINK( CheckHdl, weld::Toggleable&, void );
     DECL_LINK( SelectHdl, weld::ComboBox&, void );
     DECL_LINK( ButtonClicked, weld::Button&, void );
 
diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index aa06167be2f7..cf4598c3f287 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -120,8 +120,8 @@ private:
     std::unique_ptr<weld::RadioButton> m_xBtnRemovePassword;
 
     DECL_LINK(OKHdl, weld::Button&, void);
-    DECL_LINK(RadioBtnHdl, weld::ToggleButton&, void);
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(RadioBtnHdl, weld::Toggleable&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(PasswordModifyHdl, weld::Entry&, void);
 };
 
diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx
index d094474c926f..07ee1f3ef19c 100644
--- a/sc/source/ui/inc/scendlg.hxx
+++ b/sc/source/ui/inc/scendlg.hxx
@@ -52,7 +52,7 @@ private:
     std::unique_ptr<weld::Label> m_xOnFt;
 
     DECL_LINK(OkHdl, weld::Button&, void);
-    DECL_LINK(EnableHdl, weld::ToggleButton&, void);
+    DECL_LINK(EnableHdl, weld::Toggleable&, void);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 184e37dc9bf3..5064243ae58e 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -106,9 +106,9 @@ private:
 
                                 DECL_LINK( CharSetHdl, weld::ComboBox&, void );
                                 DECL_LINK( FirstRowHdl, weld::SpinButton&, void );
-                                DECL_LINK( RbSepFixHdl, weld::ToggleButton&, void );
+                                DECL_LINK( RbSepFixHdl, weld::Toggleable&, void );
                                 DECL_LINK( SeparatorEditHdl, weld::Entry&, void );
-                                DECL_LINK( SeparatorClickHdl, weld::ToggleButton&, void );
+                                DECL_LINK( SeparatorClickHdl, weld::Toggleable&, 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/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx
index 2ccbffc851ea..a89d508a20e5 100644
--- a/sc/source/ui/inc/scuiautofmt.hxx
+++ b/sc/source/ui/inc/scuiautofmt.hxx
@@ -65,7 +65,7 @@ private:
     void Init           ();
     void UpdateChecks   ();
 
-    DECL_LINK( CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK( CheckHdl, weld::Toggleable&, void );
     DECL_LINK( AddHdl, weld::Button&, void );
     DECL_LINK( RemoveHdl, weld::Button&, void );
     DECL_LINK( SelFmtHdl, weld::TreeView&, void );
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index b7e4f8e86baa..03d488524955 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -68,7 +68,7 @@ private:
     void FillFromTextEncodingTable(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags = 0);
     void FillFromDbTextEncodingMap(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags = 0);
 
-    DECL_LINK(FixedWidthHdl, weld::ToggleButton&, void);
+    DECL_LINK(FixedWidthHdl, weld::Toggleable&, void);
     DECL_LINK(DoubleClickHdl, weld::TreeView&, bool);
 };
 
diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx
index a6992c025fc0..54d40a39de1e 100644
--- a/sc/source/ui/inc/searchresults.hxx
+++ b/sc/source/ui/inc/searchresults.hxx
@@ -30,7 +30,7 @@ class SearchResultsDlg : public SfxDialogController
 
     DECL_LINK(ListSelectHdl, weld::TreeView&, void);
     DECL_LINK(HeaderBarClick, int, void);
-    DECL_STATIC_LINK(SearchResultsDlg, OnShowToggled, weld::ToggleButton&, void);
+    DECL_STATIC_LINK(SearchResultsDlg, OnShowToggled, weld::Toggleable&, void);
 public:
     SearchResultsDlg(SfxBindings* _pBindings, weld::Window* pParent);
     virtual ~SearchResultsDlg() override;
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index fb4258a7a150..d6dcc4810d86 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -38,7 +38,7 @@ private:
     std::unique_ptr<weld::Label> m_xFtWarning;
     std::unique_ptr<weld::TreeView> m_xLbUsers;
 
-    DECL_LINK(ToggleHandle, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHandle, weld::Toggleable&, void);
     DECL_LINK(SizeAllocated, const Size&, void);
 
 public:
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index b7ca470b6e92..cd7c9f10bb7e 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -57,11 +57,11 @@ private:
     std::unique_ptr<weld::CheckButton> m_xBtnHidePrint;
 
     // Handler:
-    DECL_LINK(ProtectClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(HideCellClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(HideFormulaClickHdl, weld::ToggleButton&, void);
-    DECL_LINK(HidePrintClickHdl, weld::ToggleButton&, void);
-    void ButtonClick(weld::ToggleButton& rBox);
+    DECL_LINK(ProtectClickHdl, weld::Toggleable&, void);
+    DECL_LINK(HideCellClickHdl, weld::Toggleable&, void);
+    DECL_LINK(HideFormulaClickHdl, weld::Toggleable&, void);
+    DECL_LINK(HidePrintClickHdl, weld::Toggleable&, void);
+    void ButtonClick(weld::Toggleable& rBox);
     void UpdateButtons();
 };
 
diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx
index 71e092cb0667..35e2fffa1308 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -46,7 +46,7 @@ private:
     std::unique_ptr<SvxLanguageBox> m_xLbCustomLang;
 
     DECL_LINK(OKHdl, weld::Button&, void);
-    DECL_LINK(RadioHdl, weld::ToggleButton&, void);
+    DECL_LINK(RadioHdl, weld::Toggleable&, void);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 4ecdec717a19..b7c4989a0c20 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -67,8 +67,8 @@ private:
     void            Init();
 
     // Handler:
-    DECL_LINK( RadioClickHdl, weld::ToggleButton&, void );
-    DECL_LINK( CheckClickHdl, weld::ToggleButton&, void );
+    DECL_LINK( RadioClickHdl, weld::Toggleable&, void );
+    DECL_LINK( CheckClickHdl, weld::Toggleable&, void );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 77d6567694c7..6f8a4c601cdf 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -46,7 +46,7 @@ private:
     bool IsValidSeparator(const OUString& rSep) const;
 
     DECL_LINK(ButtonHdl, weld::Button&, void);
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
     DECL_LINK(SepInsertTextHdl, OUString&, bool);
     DECL_LINK(ColSepInsertTextHdl, OUString&, bool);
     DECL_LINK(RowSepInsertTextHdl, OUString&, bool);
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 36df5352a59f..911d8bccd1ce 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -48,7 +48,7 @@ private:
     std::unique_ptr<weld::Button> m_xBtnEdit;
 
     DECL_LINK(BtnHdl, weld::Button&, void);
-    DECL_LINK(TurnOnHdl, weld::ToggleButton&, void);
+    DECL_LINK(TurnOnHdl, weld::Toggleable&, void);
 };
 
 class ScHeaderPage : public ScHFPage
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 3332263bf121..9f04aeafc23f 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -141,10 +141,10 @@ private:
     void FillUserSortListBox    ();
 
     // Handler ------------------------
-    DECL_LINK( EnableHdl, weld::ToggleButton&, void );
+    DECL_LINK( EnableHdl, weld::Toggleable&, void );
     DECL_LINK( SelOutPosHdl, weld::ComboBox&, void );
     void EdOutPosModHdl();
-    DECL_LINK( SortDirHdl, weld::ToggleButton&, void );
+    DECL_LINK( SortDirHdl, weld::Toggleable&, void );
     void FillAlgor();
     DECL_LINK( FillAlgorHdl, weld::ComboBox&, void );
 };
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 4edaddc24f61..faa252c3a9c0 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::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     void SelectHdl(const weld::Widget*);
 };
 
@@ -126,7 +126,7 @@ private:
     void FillUserSortListBox    ();
 
     // Handler ------------------------
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckHdl, weld::Toggleable&, void);
 
     ScViewData*             pViewData;
     ScDocument*             pDoc;
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 3f22ebce103a..6cc5888a4d9b 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -70,11 +70,11 @@ private:
 private:
 
     // Handler:
-    DECL_LINK(PageDirHdl, weld::ToggleButton&, void);
-    DECL_LINK(PageNoHdl, weld::ToggleButton&, void);
-    void PageNoHdl(const weld::ToggleButton* pBtn);
+    DECL_LINK(PageDirHdl, weld::Toggleable&, void);
+    DECL_LINK(PageNoHdl, weld::Toggleable&, void);
+    void PageNoHdl(const weld::Toggleable* pBtn);
     DECL_LINK(ScaleHdl, weld::ComboBox&, void);
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 59acf3a4a547..0306044d4f9f 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -58,7 +58,7 @@ class ScTpContentOptions : public SfxTabPage
     void    InitGridOpt();
     DECL_LINK( GridHdl, weld::ComboBox&, void );
     DECL_LINK( SelLbObjHdl, weld::ComboBox&, void );
-    DECL_LINK( CBHdl, weld::ToggleButton&, void );
+    DECL_LINK( CBHdl, weld::Toggleable&, void );
 
 public:
     ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
@@ -96,7 +96,7 @@ class ScTpLayoutOptions : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xEnterPasteModeCB;
 
     DECL_LINK(MetricHdl, weld::ComboBox&, void );
-    DECL_LINK( AlignHdl, weld::ToggleButton&, void );
+    DECL_LINK( AlignHdl, weld::Toggleable&, void );
 
 
 public:
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 9216c8b75766..495a6ea5ad72 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::ToggleButton&, void);
+                                DECL_LINK(CheckHdl, weld::Toggleable&, void);
 
     OUString                    maStrMin;
     OUString                    maStrMax;
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 09ca326e6d9a..15d12d42b69a 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -728,7 +728,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl, formula::RefEdit&, v
     }
 }
 
-IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColRowToggleHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColRowToggleHdl, weld::Toggleable&, void)
 {
     if (m_xBtnColHead->get_active())
     {
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index efbf6ab28cad..a713b9723a3e 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -58,7 +58,7 @@ IMPL_LINK_NOARG(DataStreamDlg, BrowseHdl, weld::Button&, void)
     UpdateEnable();
 }
 
-IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, weld::ToggleButton&, void) { UpdateEnable(); }
+IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, weld::Toggleable&, void) { UpdateEnable(); }
 
 IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, weld::ComboBox&, void) { UpdateEnable(); }
 
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 0caa9075c9f6..9d804c252419 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -117,7 +117,7 @@ void ScDeleteContentsDlg::DisableObjects()
     m_xBtnDelObjects->set_sensitive(false);
 }
 
-IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, weld::Toggleable&, void)
 {
     DisableChecks( m_xBtnDelAll->get_active() );
 }
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index f47ee81942c7..8fd45f501b1f 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -221,7 +221,7 @@ weld::Entry* ScFillSeriesDlg::CheckValues()
 }
 
 // Handler:
-IMPL_LINK(ScFillSeriesDlg, DisableHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScFillSeriesDlg, DisableHdl, weld::Toggleable&, rBtn, void)
 {
     if (&rBtn == m_xBtnDate.get())
     {
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index c75220824fe7..fa655f80e405 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -161,7 +161,7 @@ bool ScHighlightChgDlg::IsRefInputMode() const
     return m_xEdAssign->GetWidget()->get_visible();
 }
 
-IMPL_LINK_NOARG(ScHighlightChgDlg, HighlightHandle, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScHighlightChgDlg, HighlightHandle, weld::Toggleable&, void)
 {
     if (m_xHighlightBox->get_active())
     {
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 12b95d95fd3f..879ed28354f3 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -319,12 +319,12 @@ IMPL_LINK(ScInsertContentsDlg, ShortCutHdl, weld::Button&, rBtn, void)
     if (mxImmediately->get_active()) m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl, weld::Toggleable&, void)
 {
     DisableChecks( mxBtnInsAll->get_active() );
 }
 
-IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl, weld::Toggleable&, void)
 {
     TestModes();
 }
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 6ccdc01991be..748318997fb6 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -249,7 +249,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl, weld::SpinButton&, void)
     DoEnable_Impl();
 }
 
-IMPL_LINK(ScInsertTableDlg, ChoiceHdl_Impl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ScInsertTableDlg, ChoiceHdl_Impl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index a8887a301855..480347e159a7 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -173,7 +173,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl, weld::TreeView&, void)
     UpdateEnable();
 }
 
-IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, weld::Toggleable&, void)
 {
     UpdateEnable();
 }
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 69a728068916..80c98537d463 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -85,7 +85,7 @@ int ScMetricInputDlg::GetInputValue() const
 
 // Handler:
 
-IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, weld::Toggleable&, void)
 {
     if (m_xBtnDefVal->get_active())
     {
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index ff8657fb96a3..b753b678b631 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -238,7 +238,7 @@ void ScMoveTableDlg::InitDocListBox()
 
 // Handler:
 
-IMPL_LINK(ScMoveTableDlg, CheckBtnHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScMoveTableDlg, CheckBtnHdl, weld::Toggleable&, rBtn, void)
 {
     if (&rBtn == m_xBtnCopy.get())
         ResetRenameInput();
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index a1718ac985ed..920e7bfc4888 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -127,10 +127,9 @@ void ScTableProtectionDlg::EnableOptionalWidgets(bool bEnable)
 {
     m_xPasswords->set_sensitive(bEnable);
     m_xOptions->set_sensitive(bEnable);
-//TODO    m_xOptionsListBox->Invalidate();
 }
 
-IMPL_LINK(ScTableProtectionDlg, CheckBoxHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScTableProtectionDlg, CheckBoxHdl, weld::Toggleable&, rBtn, void)
 {
     if (&rBtn == m_xBtnProtect.get())
     {
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 9af22432648d..c7b9084a82d9 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -339,7 +339,7 @@ void ScRetypePassInputDlg::CheckPasswordInput()
 
 IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl, weld::Button&, void) { m_xDialog->response(RET_OK); }
 
-IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::Toggleable&, void)
 {
     if (m_xBtnRetypePassword->get_active())
     {
@@ -353,7 +353,7 @@ IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::ToggleButton&, void)
     }
 }
 
-IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl, weld::Toggleable&, void)
 {
     CheckPasswordInput();
 }
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 53cb8b7094ff..d08c93b3e5dc 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -151,7 +151,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl, weld::TreeView&, bool)
     return true;
 }
 
-IMPL_LINK(ScAutoFormatDlg, CheckHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScAutoFormatDlg, CheckHdl, weld::Toggleable&, rBtn, void)
 {
     ScAutoFormatData* pData = pFormat->findByIndex(nIndex);
     bool bCheck = rBtn.get_active();
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 9f1a6e16185b..eb7c1f5c6e57 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -83,7 +83,7 @@ ScShareDocumentDlg::~ScShareDocumentDlg()
 {
 }
 
-IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle, weld::Toggleable&, void)
 {
     m_xFtWarning->set_sensitive(m_xCbShare->get_active());
 }
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index b3ee50eac252..5be421e44607 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -218,10 +218,10 @@ void ScNameDlg::UpdateChecks(const ScRangeData* pData)
     // handlers, triggering handlers while already processing a handler can
     // ( and does in this case ) corrupt the internal data
 
-    m_xBtnCriteria->connect_toggled( Link<weld::ToggleButton&,void>() );
-    m_xBtnPrintArea->connect_toggled( Link<weld::ToggleButton&,void>() );
-    m_xBtnColHeader->connect_toggled( Link<weld::ToggleButton&,void>() );
-    m_xBtnRowHeader->connect_toggled( Link<weld::ToggleButton&,void>() );
+    m_xBtnCriteria->connect_toggled( Link<weld::Toggleable&,void>() );
+    m_xBtnPrintArea->connect_toggled( Link<weld::Toggleable&,void>() );
+    m_xBtnColHeader->connect_toggled( Link<weld::Toggleable&,void>() );
+    m_xBtnRowHeader->connect_toggled( Link<weld::Toggleable&,void>() );
 
     m_xBtnCriteria->set_active( pData->HasType( ScRangeData::Type::Criteria ) );
     m_xBtnPrintArea->set_active( pData->HasType( ScRangeData::Type::PrintArea ) );
@@ -229,7 +229,7 @@ void ScNameDlg::UpdateChecks(const ScRangeData* pData)
     m_xBtnRowHeader->set_active( pData->HasType( ScRangeData::Type::RowHeader ) );
 
     // Restore handlers so user input is processed again
-    Link<weld::ToggleButton&,void> aToggleHandler = LINK( this, ScNameDlg, EdModifyCheckBoxHdl );
+    Link<weld::Toggleable&,void> aToggleHandler = LINK( this, ScNameDlg, EdModifyCheckBoxHdl );
     m_xBtnCriteria->connect_toggled( aToggleHandler );
     m_xBtnPrintArea->connect_toggled( aToggleHandler );
     m_xBtnColHeader->connect_toggled( aToggleHandler );
@@ -472,7 +472,7 @@ IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl, weld::Button&, void)
     RemovePushed();
 }
 
-IMPL_LINK_NOARG(ScNameDlg, EdModifyCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScNameDlg, EdModifyCheckBoxHdl, weld::Toggleable&, void)
 {
     NameModified();
 }
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index a3e9d73935d1..ec65fb9d8014 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -111,7 +111,7 @@ void ScCalcOptionsDialog::CoupleEmptyAsZeroToStringConversion()
     }
 }
 
-IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, weld::ToggleButton&, rCheckBox, void )
+IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, weld::Toggleable&, rCheckBox, void )
 {
     maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero = rCheckBox.get_active();
 }
@@ -127,7 +127,7 @@ IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, weld::ComboBox&, rSyntax, void
     maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.get_active()));
 }
 
-IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, weld::ToggleButton&, rCheckBox, void)
+IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, weld::Toggleable&, rCheckBox, void)
 {
     mbWriteConfig = !rCheckBox.get_active();
 }
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 003f58ff11ac..97d7bb21c48e 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -18,10 +18,10 @@ public:
     ScCalcOptionsDialog(weld::Window* pParent, const ScCalcConfig& rConfig, bool bWriteConfig);
     virtual ~ScCalcOptionsDialog() override;
 
-    DECL_LINK(AsZeroModifiedHdl, weld::ToggleButton&, void);
+    DECL_LINK(AsZeroModifiedHdl, weld::Toggleable&, void);
     DECL_LINK(ConversionModifiedHdl, weld::ComboBox&, void);
     DECL_LINK(SyntaxModifiedHdl, weld::ComboBox&, void);
-    DECL_LINK(CurrentDocOnlyHdl, weld::ToggleButton&, void);
+    DECL_LINK(CurrentDocOnlyHdl, weld::Toggleable&, void);
 
     const ScCalcConfig& GetConfig() const { return maConfig; }
     bool GetWriteCalcConfig() const { return mbWriteConfig; }
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 57a78e15e382..92570ea9653f 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -222,7 +222,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
 
 // Handler:
 
-IMPL_LINK( ScTpCalcOptions, RadioClickHdl, weld::ToggleButton&, rBtn, void )
+IMPL_LINK( ScTpCalcOptions, RadioClickHdl, weld::Toggleable&, rBtn, void )
 {
     if (!rBtn.get_active())
         return;
@@ -240,7 +240,7 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, weld::ToggleButton&, rBtn, void )
     }
 }
 
-IMPL_LINK(ScTpCalcOptions, CheckClickHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScTpCalcOptions, CheckClickHdl, weld::Toggleable&, rBtn, void)
 {
     if (&rBtn == m_xBtnGeneralPrec.get())
     {
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index ba3663d95b8d..24d91000867f 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -54,7 +54,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(weld::Container* pPage, weld::DialogContr
     mxBtnSepReset->connect_clicked(aLink2);
     mxBtnCustomCalcDetails->connect_clicked(aLink2);
 
-    Link<weld::ToggleButton&,void> aToggleLink = LINK( this, ScTpFormulaOptions, ToggleHdl );
+    Link<weld::Toggleable&,void> aToggleLink = LINK( this, ScTpFormulaOptions, ToggleHdl );
     mxBtnCustomCalcDefault->connect_toggled(aToggleLink);
     mxBtnCustomCalcCustom->connect_toggled(aToggleLink);
 
@@ -177,7 +177,7 @@ IMPL_LINK( ScTpFormulaOptions, ButtonHdl, weld::Button&, rBtn, void )
         LaunchCustomCalcSettings();
 }
 
-IMPL_LINK( ScTpFormulaOptions, ToggleHdl, weld::ToggleButton&, rBtn, void )
+IMPL_LINK( ScTpFormulaOptions, ToggleHdl, weld::Toggleable&, rBtn, void )
 {
     if (!rBtn.get_active())
         return;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index a5f56979e3cd..994e74822a8e 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -65,7 +65,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogContr
     m_xDrawLB->connect_changed(aSelObjHdl);
     m_xGridLB->connect_changed( LINK( this, ScTpContentOptions, GridHdl ) );
 
-    Link<weld::ToggleButton&, void> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) );
+    Link<weld::Toggleable&, void> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) );
     m_xFormulaCB->connect_toggled(aCBHdl);
     m_xNilCB->connect_toggled(aCBHdl);
     m_xAnnotCB->connect_toggled(aCBHdl);
@@ -232,7 +232,7 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, weld::ComboBox&, rLb, void )
     m_xLocalOptions->SetObjMode( eType, eMode );
 }
 
-IMPL_LINK( ScTpContentOptions, CBHdl, weld::ToggleButton&, rBtn, void )
+IMPL_LINK( ScTpContentOptions, CBHdl, weld::Toggleable&, rBtn, void )
 {
     ScViewOption eOption = VOPT_FORMULAS;
     bool         bChecked = rBtn.get_active();
@@ -603,7 +603,7 @@ IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl, weld::ComboBox&, void)
     }
 }
 
-IMPL_LINK(ScTpLayoutOptions, AlignHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTpLayoutOptions, AlignHdl, weld::Toggleable&, rBox, void)
 {
     m_xAlignLB->set_sensitive(rBox.get_active());
 }
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index e04f2694507c..3fb27a9cf43f 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -128,7 +128,7 @@ DeactivateRC ScHFPage::DeactivatePage( SfxItemSet* pSetP )
 
 // Handler:
 
-IMPL_LINK_NOARG(ScHFPage, TurnOnHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScHFPage, TurnOnHdl, weld::Toggleable&, void)
 {
     SvxHFPage::TurnOnHdl(*m_xTurnOnBox);
 
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 76ecb43fb8ad..3b987debda35 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -39,7 +39,7 @@ const sal_uInt16 ScTablePage::pPageTableRanges[] =
 static bool lcl_PutVObjModeItem(sal_uInt16  nWhich,
                           SfxItemSet&       rCoreSet,
                           const SfxItemSet& rOldSet,
-                          const weld::ToggleButton& rBtn);
+                          const weld::Toggleable& rBtn);
 
 static bool lcl_PutScaleItem( sal_uInt16    nWhich,
                        SfxItemSet&          rCoreSet,
@@ -351,17 +351,17 @@ DeactivateRC ScTablePage::DeactivatePage( SfxItemSet* pSetP )
 
 // Handler:
 
-IMPL_LINK_NOARG(ScTablePage, PageDirHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ScTablePage, PageDirHdl, weld::Toggleable&, void)
 {
     ShowImage();
 }
 
-IMPL_LINK(ScTablePage, PageNoHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(ScTablePage, PageNoHdl, weld::Toggleable&, rBtn, void)
 {
     PageNoHdl(&rBtn);
 }
 
-void ScTablePage::PageNoHdl(const weld::ToggleButton* pBtn)
+void ScTablePage::PageNoHdl(const weld::Toggleable* pBtn)
 {
     if (m_xBtnPageNo->get_active())
     {
@@ -385,7 +385,7 @@ IMPL_LINK_NOARG(ScTablePage, ScaleHdl, weld::ComboBox&, void)
     m_xBxScalePageNum->set_visible(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_TO_PAGES);
 }
 
-IMPL_LINK(ScTablePage, ToggleHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(ScTablePage, ToggleHdl, weld::Toggleable&, rBox, void)
 {
     if (&rBox == m_xCbScalePageWidth.get())
     {
@@ -437,7 +437,7 @@ static bool lcl_PutBoolItem( sal_uInt16            nWhich,
 static bool lcl_PutVObjModeItem( sal_uInt16            nWhich,
                          SfxItemSet&        rCoreSet,
                          const SfxItemSet&  rOldSet,
-                         const weld::ToggleButton&    rBtn )
+                         const weld::Toggleable&    rBtn )
 {
     bool bIsChecked   = rBtn.get_active();
     bool bDataChanged =     rBtn.get_saved_state() == (bIsChecked ? 1 : 0)
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index ff91ad41c0b0..eb4dfd98ebd4 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -122,13 +122,13 @@ void AlignmentPropertyPanel::Initialize()
     mxMtrAngle->connect_value_changed(LINK( this, AlignmentPropertyPanel, AngleModifiedHdl));
     mxCBStacked->connect_toggled(LINK(this, AlignmentPropertyPanel, ClickStackHdl));
 
-    Link<weld::ToggleButton&,void> aLink2 = LINK(this, AlignmentPropertyPanel, ReferenceEdgeHdl);
+    Link<weld::Toggleable&,void> aLink2 = LINK(this, AlignmentPropertyPanel, ReferenceEdgeHdl);
     mxRefEdgeBottom->connect_toggled(aLink2);
     mxRefEdgeTop->connect_toggled(aLink2);
     mxRefEdgeStd->connect_toggled(aLink2);
 }
 
-IMPL_LINK(AlignmentPropertyPanel, ReferenceEdgeHdl, weld::ToggleButton&, rToggle, void)
+IMPL_LINK(AlignmentPropertyPanel, ReferenceEdgeHdl, weld::Toggleable&, rToggle, void)
 {
     if (mbSettingToggles)
         return;
@@ -155,7 +155,7 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl, weld::MetricSpinButto
         SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, { &aAngleItem });
 }
 
-IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl, weld::Toggleable&, void )
 {
     bool bVertical = mxCBStacked->get_active();
     ScVerticalStackCell aStackItem(bVertical);
@@ -172,7 +172,7 @@ IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl, weld::MetricSpinButt
             SfxCallMode::RECORD, { &aItem });
 }
 
-IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, weld::Toggleable&, void)
 {
     bool bState = mxCBXMergeCell->get_active();
 
@@ -183,7 +183,7 @@ IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, weld::ToggleButton&
     GetBindings()->Invalidate(FID_MERGE_TOGGLE,true);
 }
 
-IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl, weld::Toggleable&, void)
 {
     bool bState = mxCBXWrapText->get_active();
     ScLineBreakCell aItem(bState);
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index 37073c3cf2ea..77c3a3162a4e 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -99,11 +99,11 @@ private:
     SfxBindings*                                mpBindings;
 
     DECL_LINK( MFLeftIndentMdyHdl, weld::MetricSpinButton&, void );
-    DECL_LINK( CBOXMergnCellClkHdl, weld::ToggleButton&, void );
-    DECL_LINK( CBOXWrapTextClkHdl, weld::ToggleButton&, void );
+    DECL_LINK( CBOXMergnCellClkHdl, weld::Toggleable&, void );
+    DECL_LINK( CBOXWrapTextClkHdl, weld::Toggleable&, void );
     DECL_LINK( AngleModifiedHdl, weld::MetricSpinButton&, void );
-    DECL_LINK( ClickStackHdl, weld::ToggleButton&, void );
-    DECL_LINK( ReferenceEdgeHdl, weld::ToggleButton&, void );
+    DECL_LINK( ClickStackHdl, weld::Toggleable&, void );
+    DECL_LINK( ReferenceEdgeHdl, weld::Toggleable&, void );
 
     void Initialize();
 };
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 93dd19da0c98..9057f9bf3923 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -103,7 +103,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, weld::ComboBox&, rBox,
     }
 }
 
-IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueClickHdl, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueClickHdl, weld::Toggleable&, void )
 {
     NumFormatValueHdl(*mxEdDecimals);
 }
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 7c540beef5ee..7f16dffb92f4 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -83,7 +83,7 @@ private:
 
     DECL_LINK(NumFormatSelectHdl, weld::ComboBox&, void);
     DECL_LINK(NumFormatValueHdl, weld::SpinButton&, void);
-    DECL_LINK(NumFormatValueClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(NumFormatValueClickHdl, weld::Toggleable&, void);
 
     void Initialize();
     void DisableControls();